andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10842 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
Giovanni Di Sirio 2017-10-17 11:53:00 +00:00
parent ba2ff06045
commit 18fee78c20
8 changed files with 61 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h
View File

@ -42,14 +42,14 @@
* @brief System time counter resolution. * @brief System time counter resolution.
* @note Allowed values are 16 or 32 bits. * @note Allowed values are 16 or 32 bits.
*/ */
#define CH_CFG_ST_RESOLUTION 16 #define CH_CFG_ST_RESOLUTION 32
/** /**
* @brief System tick frequency. * @brief System tick frequency.
* @details Frequency of the system timer that drives the system ticks. This * @details Frequency of the system timer that drives the system ticks. This
* setting also defines the system tick time unit. * setting also defines the system tick time unit.
*/ */
#define CH_CFG_ST_FREQUENCY 100000 #define CH_CFG_ST_FREQUENCY 10000
/** /**
* @brief Time intervals data size. * @brief Time intervals data size.

4
demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch
View File

@ -34,8 +34,8 @@
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/> <stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/> <stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;delta-next-vtlist-null-_idle_thread.lto_priv.25-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/> <stringAttribute key="org.eclipse.cdt.launch.FORMAT" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&lt;contentList&gt;&lt;content id=&quot;delta-next-vtlist-null-_idle_thread.lto_priv.25-(format)&quot; val=&quot;4&quot;/&gt;&lt;/contentList&gt;"/>
<stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;globalVariableList/&gt;&#10;"/> <stringAttribute key="org.eclipse.cdt.launch.GLOBAL_VARIABLES" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;globalVariableList/&gt;&#13;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;memoryBlockExpressionList&gt;&#10;&lt;memoryBlockExpressionItem&gt;&#10;&lt;expression text=&quot;0x0&quot;/&gt;&#10;&lt;/memoryBlockExpressionItem&gt;&#10;&lt;/memoryBlockExpressionList&gt;&#10;"/> <stringAttribute key="org.eclipse.cdt.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList&gt;&#13;&#10;&lt;memoryBlockExpressionItem&gt;&#13;&#10;&lt;expression text=&quot;0x0&quot;/&gt;&#13;&#10;&lt;/memoryBlockExpressionItem&gt;&#13;&#10;&lt;/memoryBlockExpressionList&gt;&#13;&#10;"/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/> <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="./build/ch.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RT-STM32F746G-DISCOVERY"/> <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="RT-STM32F746G-DISCOVERY"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/> <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>

4
os/rt/src/chthreads.c
View File

@ -670,7 +670,7 @@ void chThdSleepUntil(systime_t time) {
sysinterval_t interval; sysinterval_t interval;
chSysLock(); chSysLock();
interval = chTimeDiffX(time, chVTGetSystemTimeX()); interval = chTimeDiffX(chVTGetSystemTimeX(), time);
if (interval > (sysinterval_t)0) { if (interval > (sysinterval_t)0) {
chThdSleepS(interval); chThdSleepS(interval);
} }
@ -697,7 +697,7 @@ systime_t chThdSleepUntilWindowed(systime_t prev, systime_t next) {
chSysLock(); chSysLock();
time = chVTGetSystemTimeX(); time = chVTGetSystemTimeX();
if (chTimeIsInRangeX(time, prev, next)) { if (chTimeIsInRangeX(time, prev, next)) {
chThdSleepS(chTimeDiffX(next, time)); chThdSleepS(chTimeDiffX(time, next));
} }
chSysUnlock(); chSysUnlock();

2
test/oslib/configuration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<SPC5-Config version="1.0.0"> <SPC5-Config version="1.0.0">
<application name="ChibiOS/RT Test Suite" version="1.0.0" standalone="true" locked="false"> <application name="ChibiOS/RT Test Suite" version="1.0.0" standalone="true" locked="false">
<description>Test Specification for ChibiOS/RT.</description> <description>ChibiOS OS Library Test Suite.</description>
<component id="org.chibios.spc5.components.portable.generic_startup"> <component id="org.chibios.spc5.components.portable.generic_startup">
<component id="org.chibios.spc5.components.portable.chibios_unitary_tests_engine" /> <component id="org.chibios.spc5.components.portable.chibios_unitary_tests_engine" />
</component> </component>

2
test/oslib/source/test/oslib_test_root.c
View File

@ -61,7 +61,7 @@ const testsequence_t * const oslib_test_suite_array[] = {
* @brief Test suite root structure. * @brief Test suite root structure.
*/ */
const testsuite_t oslib_test_suite = { const testsuite_t oslib_test_suite = {
NULL, "ChibiOS OS Library Test Suite.",
oslib_test_suite_array oslib_test_suite_array
}; };

2
test/rt/configuration.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<SPC5-Config version="1.0.0"> <SPC5-Config version="1.0.0">
<application name="ChibiOS/RT Test Suite" version="1.0.0" standalone="true" locked="false"> <application name="ChibiOS/RT Test Suite" version="1.0.0" standalone="true" locked="false">
<description>Test Specification for ChibiOS/RT.</description> <description>ChibiOS/RT Library Test Suite.</description>
<component id="org.chibios.spc5.components.portable.generic_startup"> <component id="org.chibios.spc5.components.portable.generic_startup">
<component id="org.chibios.spc5.components.portable.chibios_unitary_tests_engine" /> <component id="org.chibios.spc5.components.portable.chibios_unitary_tests_engine" />
</component> </component>

2
test/rt/source/test/rt_test_root.c
View File

@ -79,7 +79,7 @@ const testsequence_t * const rt_test_suite_array[] = {
* @brief Test suite root structure. * @brief Test suite root structure.
*/ */
const testsuite_t rt_test_suite = { const testsuite_t rt_test_suite = {
NULL, "ChibiOS/RT Library Test Suite.",
rt_test_suite_array rt_test_suite_array
}; };

2
tools/ftl/processors/unittest/test/test_root.c.ftl
View File

@ -68,7 +68,7 @@ const testsequence_t * const ${prefix_lower}test_suite_array[] = {
* @brief Test suite root structure. * @brief Test suite root structure.
*/ */
const testsuite_t ${prefix_lower}test_suite = { const testsuite_t ${prefix_lower}test_suite = {
NULL, "${utils.WithDot(conf.*.application.description[0]?trim)}",
${prefix_lower}test_suite_array ${prefix_lower}test_suite_array
}; };