From f6ddc053fd02fec7073d60767f2b6bb0a9979623 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Mon, 23 Oct 2017 12:46:52 +0000 Subject: Mass updated all demos with the new test code. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10886 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile | 4 +++- demos/STM32/RT-STM32F303RE-NUCLEO64/main.c | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'demos/STM32/RT-STM32F303RE-NUCLEO64') diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile b/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile index 25c7b8123..bf5377a39 100644 --- a/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile +++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/Makefile @@ -98,7 +98,9 @@ include $(CHIBIOS)/os/hal/osal/rt/osal.mk include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk # Other files (optional). -include $(CHIBIOS)/test/rt/test.mk +include $(CHIBIOS)/test/lib/test.mk +include $(CHIBIOS)/test/rt/rt_test.mk +include $(CHIBIOS)/test/oslib/oslib_test.mk # Define linker script file here LDSCRIPT= $(STARTUPLD)/STM32F303xE.ld diff --git a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c index f198405d6..1d6a2b831 100644 --- a/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c +++ b/demos/STM32/RT-STM32F303RE-NUCLEO64/main.c @@ -17,6 +17,7 @@ #include "ch.h" #include "hal.h" #include "rt_test_root.h" +#include "oslib_test_root.h" /* * Green LED blinker thread, times are in milliseconds. @@ -64,8 +65,10 @@ int main(void) { * sleeping in a loop and check the button state. */ while (true) { - if (!palReadPad(GPIOC, GPIOC_BUTTON)) + if (!palReadPad(GPIOC, GPIOC_BUTTON)) { test_execute((BaseSequentialStream *)&SD2, &rt_test_suite); + test_execute((BaseSequentialStream *)&SD2, &oslib_test_suite); + } chThdSleepMilliseconds(500); } } -- cgit v1.2.3