diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-29 15:36:00 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2016-03-29 15:36:00 +0000 |
| commit | c7de7490b130ab01b2f0242a0f0412afb634bbe3 (patch) | |
| tree | 321e6f6eb7e360add392bf44b4aac26977d1a79b | |
| parent | da68278385b02505d32cbaa9b623d689ed68cbcf (diff) | |
| download | ChibiOS-c7de7490b130ab01b2f0242a0f0412afb634bbe3.tar.gz ChibiOS-c7de7490b130ab01b2f0242a0f0412afb634bbe3.tar.bz2 ChibiOS-c7de7490b130ab01b2f0242a0f0412afb634bbe3.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9181 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h | 6 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F746G-DISCOVERY/main.c | 4 | ||||
| -rw-r--r-- | test/rt/test.mk | 25 |
3 files changed, 17 insertions, 18 deletions
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h index d5e4bc387..db649e544 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/chconf.h @@ -48,7 +48,7 @@ * @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 10000
+#define CH_CFG_ST_FREQUENCY 1000
/**
* @brief Time delta constant for the tick-less mode.
@@ -58,7 +58,7 @@ * The value one is not valid, timeouts are rounded up to
* this value.
*/
-#define CH_CFG_ST_TIMEDELTA 2
+#define CH_CFG_ST_TIMEDELTA 0
/** @} */
@@ -396,7 +396,7 @@ * @note This debug option is not currently compatible with the
* tickless mode.
*/
-#define CH_DBG_THREADS_PROFILING FALSE
+#define CH_DBG_THREADS_PROFILING TRUE
/** @} */
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c index c5b7a50da..47616f8ca 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/main.c +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/main.c @@ -16,7 +16,7 @@ #include "ch.h"
#include "hal.h"
-#include "test.h"
+#include "ch_test.h"
/*
* This is a periodic thread that does absolutely nothing except flashing
@@ -72,7 +72,7 @@ int main(void) { */
while (true) {
if (palReadLine(LINE_BUTTON_USER))
- TestThread(&SD1);
+ test_execute((BaseSequentialStream *)&SD1);
chThdSleepMilliseconds(500);
}
}
diff --git a/test/rt/test.mk b/test/rt/test.mk index 8e929df3c..026536008 100644 --- a/test/rt/test.mk +++ b/test/rt/test.mk @@ -1,16 +1,15 @@ # List of all the ChibiOS/RT test files.
-TESTSRC = ${CHIBIOS}/test/rt/test.c \
- ${CHIBIOS}/test/rt/testthd.c \
- ${CHIBIOS}/test/rt/testsem.c \
- ${CHIBIOS}/test/rt/testmtx.c \
- ${CHIBIOS}/test/rt/testmsg.c \
- ${CHIBIOS}/test/rt/testmbox.c \
- ${CHIBIOS}/test/rt/testevt.c \
- ${CHIBIOS}/test/rt/testheap.c \
- ${CHIBIOS}/test/rt/testpools.c \
- ${CHIBIOS}/test/rt/testdyn.c \
- ${CHIBIOS}/test/rt/testsys.c \
- ${CHIBIOS}/test/rt/testbmk.c
+TESTSRC = ${CHIBIOS}/test/lib/ch_test.c \
+ ${CHIBIOS}/test/rt/source/test/test_root.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_001.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_002.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_003.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_004.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_005.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_006.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_007.c \
+ ${CHIBIOS}/test/rt/source/test/test_sequence_008.c
# Required include directories
-TESTINC = ${CHIBIOS}/test/rt
+TESTINC = ${CHIBIOS}/test/lib \
+ ${CHIBIOS}/test/rt/source/test
|