diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 15:49:25 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 15:49:25 +0000 |
| commit | b8352d5f4b945b307d5850b3bb2259e9ea3c75a8 (patch) | |
| tree | 4d770a6cab369323025fe2f1aed80cdb55852e3a /testhal/STM32/STM32F1xx/CAN | |
| parent | 4efd9dfd7d4acf6347b7227bb9f251260c7191d6 (diff) | |
| download | ChibiOS-b8352d5f4b945b307d5850b3bb2259e9ea3c75a8.tar.gz ChibiOS-b8352d5f4b945b307d5850b3bb2259e9ea3c75a8.tar.bz2 ChibiOS-b8352d5f4b945b307d5850b3bb2259e9ea3c75a8.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10938 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32F1xx/CAN')
| -rw-r--r-- | testhal/STM32/STM32F1xx/CAN/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32F1xx/CAN/main.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testhal/STM32/STM32F1xx/CAN/Makefile b/testhal/STM32/STM32F1xx/CAN/Makefile index c136795b9..119141822 100644 --- a/testhal/STM32/STM32F1xx/CAN/Makefile +++ b/testhal/STM32/STM32F1xx/CAN/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)/STM32F103xB.ld
diff --git a/testhal/STM32/STM32F1xx/CAN/main.c b/testhal/STM32/STM32F1xx/CAN/main.c index 7b05c028d..2f8d1f42c 100644 --- a/testhal/STM32/STM32F1xx/CAN/main.c +++ b/testhal/STM32/STM32F1xx/CAN/main.c @@ -40,7 +40,7 @@ static THD_FUNCTION(can_rx, p) { chRegSetThreadName("receiver");
chEvtRegister(&CAND1.rxfull_event, &el, 0);
while (true) {
- if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0)
+ if (chEvtWaitAnyTimeout(ALL_EVENTS, TIME_MS2I(100)) == 0)
continue;
while (canReceive(&CAND1, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) {
/* Process message.*/
@@ -67,7 +67,7 @@ static THD_FUNCTION(can_tx, p) { txmsg.data32[1] = 0x00FF00FF;
while (true) {
- canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100));
+ canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100));
chThdSleepMilliseconds(500);
}
}
|