diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 16:10:48 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 16:10:48 +0000 |
| commit | c8cdb0941bea91018362a4c9bc9b0b7f3db14784 (patch) | |
| tree | b7aad5bd674a85608a8fa50d66340545501455d3 /testhal/STM32/STM32L1xx | |
| parent | e6fbbc4da8ddf97e053651ad3d38802429562a23 (diff) | |
| download | ChibiOS-c8cdb0941bea91018362a4c9bc9b0b7f3db14784.tar.gz ChibiOS-c8cdb0941bea91018362a4c9bc9b0b7f3db14784.tar.bz2 ChibiOS-c8cdb0941bea91018362a4c9bc9b0b7f3db14784.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10940 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32L1xx')
| -rw-r--r-- | testhal/STM32/STM32L1xx/ADC/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/DAC/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/IRQ_STORM/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/PWM-ICU/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/SPI/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/UART/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32L1xx/UART/main.c | 4 |
7 files changed, 14 insertions, 14 deletions
diff --git a/testhal/STM32/STM32L1xx/ADC/Makefile b/testhal/STM32/STM32L1xx/ADC/Makefile index c69af8cfa..f403302d2 100644 --- a/testhal/STM32/STM32L1xx/ADC/Makefile +++ b/testhal/STM32/STM32L1xx/ADC/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/DAC/Makefile b/testhal/STM32/STM32L1xx/DAC/Makefile index 97867274f..080af9422 100644 --- a/testhal/STM32/STM32L1xx/DAC/Makefile +++ b/testhal/STM32/STM32L1xx/DAC/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile index 816a7eb1b..150e762d7 100644 --- a/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32L1xx/IRQ_STORM/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/PWM-ICU/Makefile b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile index c69af8cfa..f403302d2 100644 --- a/testhal/STM32/STM32L1xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32L1xx/PWM-ICU/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/SPI/Makefile b/testhal/STM32/STM32L1xx/SPI/Makefile index c69af8cfa..f403302d2 100644 --- a/testhal/STM32/STM32L1xx/SPI/Makefile +++ b/testhal/STM32/STM32L1xx/SPI/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/UART/Makefile b/testhal/STM32/STM32L1xx/UART/Makefile index c69af8cfa..f403302d2 100644 --- a/testhal/STM32/STM32L1xx/UART/Makefile +++ b/testhal/STM32/STM32L1xx/UART/Makefile @@ -99,8 +99,8 @@ include $(CHIBIOS)/os/rt/rt.mk include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
# Other files (optional).
#include $(CHIBIOS)/test/lib/test.mk
-include $(CHIBIOS)/test/rt/rt_test.mk
-include $(CHIBIOS)/test/oslib/oslib_test.mk
+#include $(CHIBIOS)/test/rt/rt_test.mk
+#include $(CHIBIOS)/test/oslib/oslib_test.mk
# Define linker script file here
LDSCRIPT= $(STARTUPLD)/STM32L152xB.ld
diff --git a/testhal/STM32/STM32L1xx/UART/main.c b/testhal/STM32/STM32L1xx/UART/main.c index 2089cae58..b6d90fac4 100644 --- a/testhal/STM32/STM32L1xx/UART/main.c +++ b/testhal/STM32/STM32L1xx/UART/main.c @@ -53,7 +53,7 @@ static void txend2(UARTDriver *uartp) { palClearPad(GPIOB, GPIOB_LED4);
chSysLockFromISR();
chVTResetI(&vt1);
- chVTDoSetI(&vt1, MS2ST(5000), restart, NULL);
+ chVTDoSetI(&vt1, TIME_MS2I(5000), restart, NULL);
chSysUnlockFromISR();
}
@@ -79,7 +79,7 @@ static void rxchar(UARTDriver *uartp, uint16_t c) { palSetPad(GPIOB, GPIOB_LED4);
chSysLockFromISR();
chVTResetI(&vt2);
- chVTDoSetI(&vt2, MS2ST(200), ledoff, NULL);
+ chVTDoSetI(&vt2, TIME_MS2I(200), ledoff, NULL);
chSysUnlockFromISR();
}
|