From 18fee78c2082dd4a1bb89f8fafc100825cf1745e Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Tue, 17 Oct 2017 11:53:00 +0000 Subject: [PATCH] git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10842 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h | 4 +- ...-DISCOVERY (OpenOCD, Flash and Run).launch | 104 +++++++++--------- os/rt/src/chthreads.c | 4 +- test/oslib/configuration.xml | 2 +- test/oslib/source/test/oslib_test_root.c | 2 +- test/rt/configuration.xml | 2 +- test/rt/source/test/rt_test_root.c | 2 +- .../processors/unittest/test/test_root.c.ftl | 2 +- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h index bba658831..1bda70597 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h @@ -42,14 +42,14 @@ * @brief System time counter resolution. * @note Allowed values are 16 or 32 bits. */ -#define CH_CFG_ST_RESOLUTION 16 +#define CH_CFG_ST_RESOLUTION 32 /** * @brief System tick frequency. * @details Frequency of the system timer that drives the system ticks. This * 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. diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch index 620c606b2..92f436493 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/debug/RT-STM32F746G-DISCOVERY (OpenOCD, Flash and Run).launch @@ -1,52 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/os/rt/src/chthreads.c b/os/rt/src/chthreads.c index 49abadb2d..84a062b86 100644 --- a/os/rt/src/chthreads.c +++ b/os/rt/src/chthreads.c @@ -670,7 +670,7 @@ void chThdSleepUntil(systime_t time) { sysinterval_t interval; chSysLock(); - interval = chTimeDiffX(time, chVTGetSystemTimeX()); + interval = chTimeDiffX(chVTGetSystemTimeX(), time); if (interval > (sysinterval_t)0) { chThdSleepS(interval); } @@ -697,7 +697,7 @@ systime_t chThdSleepUntilWindowed(systime_t prev, systime_t next) { chSysLock(); time = chVTGetSystemTimeX(); if (chTimeIsInRangeX(time, prev, next)) { - chThdSleepS(chTimeDiffX(next, time)); + chThdSleepS(chTimeDiffX(time, next)); } chSysUnlock(); diff --git a/test/oslib/configuration.xml b/test/oslib/configuration.xml index 87424d929..1fcb47218 100644 --- a/test/oslib/configuration.xml +++ b/test/oslib/configuration.xml @@ -1,7 +1,7 @@ - Test Specification for ChibiOS/RT. + ChibiOS OS Library Test Suite. diff --git a/test/oslib/source/test/oslib_test_root.c b/test/oslib/source/test/oslib_test_root.c index 5c88edd75..4da5bc8fb 100644 --- a/test/oslib/source/test/oslib_test_root.c +++ b/test/oslib/source/test/oslib_test_root.c @@ -61,7 +61,7 @@ const testsequence_t * const oslib_test_suite_array[] = { * @brief Test suite root structure. */ const testsuite_t oslib_test_suite = { - NULL, + "ChibiOS OS Library Test Suite.", oslib_test_suite_array }; diff --git a/test/rt/configuration.xml b/test/rt/configuration.xml index af9b8362b..017d22f25 100644 --- a/test/rt/configuration.xml +++ b/test/rt/configuration.xml @@ -1,7 +1,7 @@ - Test Specification for ChibiOS/RT. + ChibiOS/RT Library Test Suite. diff --git a/test/rt/source/test/rt_test_root.c b/test/rt/source/test/rt_test_root.c index 37deb5f29..9e0365686 100644 --- a/test/rt/source/test/rt_test_root.c +++ b/test/rt/source/test/rt_test_root.c @@ -79,7 +79,7 @@ const testsequence_t * const rt_test_suite_array[] = { * @brief Test suite root structure. */ const testsuite_t rt_test_suite = { - NULL, + "ChibiOS/RT Library Test Suite.", rt_test_suite_array }; diff --git a/tools/ftl/processors/unittest/test/test_root.c.ftl b/tools/ftl/processors/unittest/test/test_root.c.ftl index 66035acb3..90f42cafc 100755 --- a/tools/ftl/processors/unittest/test/test_root.c.ftl +++ b/tools/ftl/processors/unittest/test/test_root.c.ftl @@ -68,7 +68,7 @@ const testsequence_t * const ${prefix_lower}test_suite_array[] = { * @brief Test suite root structure. */ const testsuite_t ${prefix_lower}test_suite = { - NULL, + "${utils.WithDot(conf.*.application.description[0]?trim)}", ${prefix_lower}test_suite_array };