From e6fbbc4da8ddf97e053651ad3d38802429562a23 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 4 Nov 2017 16:03:57 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10939 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- testhal/STM32/STM32F4xx/ADC/Makefile | 4 ++-- testhal/STM32/STM32F4xx/CAN/Makefile | 4 ++-- testhal/STM32/STM32F4xx/CAN/main.c | 6 +++--- testhal/STM32/STM32F4xx/DAC/Makefile | 4 ++-- testhal/STM32/STM32F4xx/DAC_DUAL/Makefile | 4 ++-- testhal/STM32/STM32F4xx/DMA_STORM/Makefile | 4 ++-- testhal/STM32/STM32F4xx/DMA_STORM/main.c | 8 ++++---- testhal/STM32/STM32F4xx/GPT/Makefile | 4 ++-- testhal/STM32/STM32F4xx/I2C/Makefile | 4 ++-- testhal/STM32/STM32F4xx/I2C/main.c | 2 +- testhal/STM32/STM32F4xx/I2S/Makefile | 4 ++-- testhal/STM32/STM32F4xx/IRQ_STORM/Makefile | 4 ++-- testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile | 4 ++-- testhal/STM32/STM32F4xx/PWM-ICU/Makefile | 4 ++-- testhal/STM32/STM32F4xx/RTC/Makefile | 2 +- testhal/STM32/STM32F4xx/RTC/halconf.h | 2 +- testhal/STM32/STM32F4xx/SDC/Makefile | 2 +- testhal/STM32/STM32F4xx/SDC/main.c | 8 ++++---- testhal/STM32/STM32F4xx/SPI/Makefile | 4 ++-- testhal/STM32/STM32F4xx/UART/Makefile | 4 ++-- testhal/STM32/STM32F4xx/UART/main.c | 6 +++--- testhal/STM32/STM32F4xx/WDG/Makefile | 4 ++-- testhal/STM32/STM32F7xx/GPT-ADC/Makefile | 4 ++-- testhal/STM32/STM32F7xx/IRQ_STORM/Makefile | 4 ++-- testhal/STM32/STM32F7xx/PWM-ICU/Makefile | 4 ++-- testhal/STM32/STM32F7xx/SPI/Makefile | 4 ++-- testhal/STM32/STM32F7xx/SPI/main.c | 18 ++++-------------- testhal/STM32/STM32F7xx/USB_RAW/Makefile | 2 +- 28 files changed, 59 insertions(+), 69 deletions(-) diff --git a/testhal/STM32/STM32F4xx/ADC/Makefile b/testhal/STM32/STM32F4xx/ADC/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/ADC/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/CAN/Makefile b/testhal/STM32/STM32F4xx/CAN/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/CAN/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/CAN/main.c b/testhal/STM32/STM32F4xx/CAN/main.c index 0316505a4..f2c6b5463 100644 --- a/testhal/STM32/STM32F4xx/CAN/main.c +++ b/testhal/STM32/STM32F4xx/CAN/main.c @@ -50,7 +50,7 @@ static THD_FUNCTION(can_rx, p) { chRegSetThreadName("receiver"); chEvtRegister(&cip->canp->rxfull_event, &el, 0); while (true) { - if (chEvtWaitAnyTimeout(ALL_EVENTS, MS2ST(100)) == 0) + if (chEvtWaitAnyTimeout(ALL_EVENTS, TIME_MS2I(100)) == 0) continue; while (canReceive(cip->canp, CAN_ANY_MAILBOX, &rxmsg, TIME_IMMEDIATE) == MSG_OK) { @@ -78,8 +78,8 @@ static THD_FUNCTION(can_tx, p) { txmsg.data32[1] = 0x00FF00FF; while (true) { - canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, MS2ST(100)); - canTransmit(&CAND2, CAN_ANY_MAILBOX, &txmsg, MS2ST(100)); + canTransmit(&CAND1, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100)); + canTransmit(&CAND2, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100)); chThdSleepMilliseconds(500); } } diff --git a/testhal/STM32/STM32F4xx/DAC/Makefile b/testhal/STM32/STM32F4xx/DAC/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/DAC/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile b/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/DAC_DUAL/Makefile +++ b/testhal/STM32/STM32F4xx/DAC_DUAL/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/Makefile b/testhal/STM32/STM32F4xx/DMA_STORM/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/DMA_STORM/Makefile +++ b/testhal/STM32/STM32F4xx/DMA_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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/DMA_STORM/main.c b/testhal/STM32/STM32F4xx/DMA_STORM/main.c index a8ab3ee03..67ec7fb3e 100644 --- a/testhal/STM32/STM32F4xx/DMA_STORM/main.c +++ b/testhal/STM32/STM32F4xx/DMA_STORM/main.c @@ -45,7 +45,7 @@ static void adccallback(ADCDriver *adcp, adcsample_t *buffer, size_t n) { (void)n; chSysLockFromISR(); - chVTSetI(&adcvt, MS2ST(10), tmo, (void *)"ADC timeout"); + chVTSetI(&adcvt, TIME_MS2I(10), tmo, (void *)"ADC timeout"); chSysUnlockFromISR(); } @@ -118,7 +118,7 @@ static THD_FUNCTION(spi_thread, p) { while (true) { /* Starts a VT working as watchdog to catch a malfunction in the SPI driver.*/ - chVTSet(&vt, MS2ST(10), tmo, (void *)"SPI timeout"); + chVTSet(&vt, TIME_MS2I(10), tmo, (void *)"SPI timeout"); spiExchange(spip, sizeof(txbuf), txbuf, rxbuf); @@ -172,7 +172,7 @@ int main(void) { adcSTM32EnableTSVREFE(); /* Starts an ADC continuous conversion and its watchdog virtual timer.*/ - chVTSet(&adcvt, MS2ST(10), tmo, (void *)"ADC timeout"); + chVTSet(&adcvt, TIME_MS2I(10), tmo, (void *)"ADC timeout"); adcStartConversion(&ADCD1, &adcgrpcfg2, samples2, ADC_GRP2_BUF_DEPTH); /* Activating SPI drivers.*/ @@ -204,7 +204,7 @@ int main(void) { /* Starts a VT working as watchdog to catch a malfunction in the DMA driver.*/ - chVTSet(&vt, MS2ST(10), tmo, (void *)"copy timeout"); + chVTSet(&vt, TIME_MS2I(10), tmo, (void *)"copy timeout"); /* Copy pattern 1.*/ dmaStartMemCopy(STM32_DMA2_STREAM6, diff --git a/testhal/STM32/STM32F4xx/GPT/Makefile b/testhal/STM32/STM32F4xx/GPT/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/GPT/Makefile +++ b/testhal/STM32/STM32F4xx/GPT/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/I2C/Makefile b/testhal/STM32/STM32F4xx/I2C/Makefile index e49c5aac7..b4f78f873 100644 --- a/testhal/STM32/STM32F4xx/I2C/Makefile +++ b/testhal/STM32/STM32F4xx/I2C/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/I2C/main.c b/testhal/STM32/STM32F4xx/I2C/main.c index 7aae38784..46afa4ecf 100644 --- a/testhal/STM32/STM32F4xx/I2C/main.c +++ b/testhal/STM32/STM32F4xx/I2C/main.c @@ -110,7 +110,7 @@ static const I2CConfig i2cfg2 = { */ int main(void) { msg_t status = MSG_OK; - systime_t tmo = MS2ST(4); + sysinterval_t tmo = TIME_MS2I(4); /* * System initializations. diff --git a/testhal/STM32/STM32F4xx/I2S/Makefile b/testhal/STM32/STM32F4xx/I2S/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/I2S/Makefile +++ b/testhal/STM32/STM32F4xx/I2S/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile index 73a83c818..186cda35d 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile index 4ab9e1ecd..4ee6322d1 100644 --- a/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/Makefile +++ b/testhal/STM32/STM32F4xx/IRQ_STORM_FPU/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/PWM-ICU/Makefile b/testhal/STM32/STM32F4xx/PWM-ICU/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/RTC/Makefile b/testhal/STM32/STM32F4xx/RTC/Makefile index da5d5f111..b498d26da 100644 --- a/testhal/STM32/STM32F4xx/RTC/Makefile +++ b/testhal/STM32/STM32F4xx/RTC/Makefile @@ -98,7 +98,7 @@ 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/lib/test.mk +include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk include $(CHIBIOS)/os/hal/lib/streams/streams.mk diff --git a/testhal/STM32/STM32F4xx/RTC/halconf.h b/testhal/STM32/STM32F4xx/RTC/halconf.h index f0e914a89..1684467a3 100644 --- a/testhal/STM32/STM32F4xx/RTC/halconf.h +++ b/testhal/STM32/STM32F4xx/RTC/halconf.h @@ -76,7 +76,7 @@ * @brief Enables the EXT subsystem. */ #if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) -#define HAL_USE_EXT TRUE +#define HAL_USE_EXT FALSE #endif /** diff --git a/testhal/STM32/STM32F4xx/SDC/Makefile b/testhal/STM32/STM32F4xx/SDC/Makefile index af5f1bf52..89dca9922 100644 --- a/testhal/STM32/STM32F4xx/SDC/Makefile +++ b/testhal/STM32/STM32F4xx/SDC/Makefile @@ -98,7 +98,7 @@ 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/lib/test.mk +include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk include $(CHIBIOS)/os/hal/lib/streams/streams.mk diff --git a/testhal/STM32/STM32F4xx/SDC/main.c b/testhal/STM32/STM32F4xx/SDC/main.c index 8078784a8..832e7202f 100644 --- a/testhal/STM32/STM32F4xx/SDC/main.c +++ b/testhal/STM32/STM32F4xx/SDC/main.c @@ -106,7 +106,7 @@ void cmd_sdc(BaseSequentialStream *chp, int argc, char *argv[]) { /* Single block read performance, aligned.*/ chprintf(chp, "Single block aligned read performance: "); start = chVTGetSystemTime(); - end = start + MS2ST(1000); + end = chTimeAddX(start, TIME_MS2I(1000)); n = 0; do { if (blkRead(&SDCD1, startblk, buf, 1)) { @@ -120,7 +120,7 @@ void cmd_sdc(BaseSequentialStream *chp, int argc, char *argv[]) { /* Multiple sequential blocks read performance, aligned.*/ chprintf(chp, "16 sequential blocks aligned read performance: "); start = chVTGetSystemTime(); - end = start + MS2ST(1000); + end = chTimeAddX(start, TIME_MS2I(1000)); n = 0; do { if (blkRead(&SDCD1, startblk, buf, SDC_BURST_SIZE)) { @@ -135,7 +135,7 @@ void cmd_sdc(BaseSequentialStream *chp, int argc, char *argv[]) { /* Single block read performance, unaligned.*/ chprintf(chp, "Single block unaligned read performance: "); start = chVTGetSystemTime(); - end = start + MS2ST(1000); + end = chTimeAddX(start, TIME_MS2I(1000)); n = 0; do { if (blkRead(&SDCD1, startblk, buf + 1, 1)) { @@ -149,7 +149,7 @@ void cmd_sdc(BaseSequentialStream *chp, int argc, char *argv[]) { /* Multiple sequential blocks read performance, unaligned.*/ chprintf(chp, "16 sequential blocks unaligned read performance: "); start = chVTGetSystemTime(); - end = start + MS2ST(1000); + end = chTimeAddX(start, TIME_MS2I(1000)); n = 0; do { if (blkRead(&SDCD1, startblk, buf + 1, SDC_BURST_SIZE)) { diff --git a/testhal/STM32/STM32F4xx/SPI/Makefile b/testhal/STM32/STM32F4xx/SPI/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/SPI/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/UART/Makefile b/testhal/STM32/STM32F4xx/UART/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/UART/Makefile +++ b/testhal/STM32/STM32F4xx/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F4xx/UART/main.c b/testhal/STM32/STM32F4xx/UART/main.c index c20fb1dc7..7ef53abeb 100644 --- a/testhal/STM32/STM32F4xx/UART/main.c +++ b/testhal/STM32/STM32F4xx/UART/main.c @@ -58,7 +58,7 @@ static void txend2(UARTDriver *uartp) { palSetPad(GPIOD, GPIOD_LED5); chSysLockFromISR(); chVTResetI(&vt5); - chVTSetI(&vt5, MS2ST(200), led5off, NULL); + chVTSetI(&vt5, TIME_MS2I(200), led5off, NULL); chSysUnlockFromISR(); } @@ -84,7 +84,7 @@ static void rxchar(UARTDriver *uartp, uint16_t c) { palSetPad(GPIOD, GPIOD_LED4); chSysLockFromISR(); chVTResetI(&vt4); - chVTSetI(&vt4, MS2ST(200), led4off, NULL); + chVTSetI(&vt4, TIME_MS2I(200), led4off, NULL); chSysUnlockFromISR(); } @@ -99,7 +99,7 @@ static void rxend(UARTDriver *uartp) { palSetPad(GPIOD, GPIOD_LED3); chSysLockFromISR(); chVTResetI(&vt3); - chVTSetI(&vt3, MS2ST(200), led3off, NULL); + chVTSetI(&vt3, TIME_MS2I(200), led3off, NULL); chSysUnlockFromISR(); } diff --git a/testhal/STM32/STM32F4xx/WDG/Makefile b/testhal/STM32/STM32F4xx/WDG/Makefile index d9517428c..f5ed9a72f 100644 --- a/testhal/STM32/STM32F4xx/WDG/Makefile +++ b/testhal/STM32/STM32F4xx/WDG/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)/STM32F407xG.ld diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile index 1f1d13a97..c783b61db 100644 --- a/testhal/STM32/STM32F7xx/GPT-ADC/Makefile +++ b/testhal/STM32/STM32F7xx/GPT-ADC/Makefile @@ -104,8 +104,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)/STM32F746xG.ld diff --git a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile index 188986314..8c6a1e57a 100644 --- a/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile +++ b/testhal/STM32/STM32F7xx/IRQ_STORM/Makefile @@ -104,8 +104,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)/STM32F746xG.ld diff --git a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile index 1f1d13a97..c783b61db 100644 --- a/testhal/STM32/STM32F7xx/PWM-ICU/Makefile +++ b/testhal/STM32/STM32F7xx/PWM-ICU/Makefile @@ -104,8 +104,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)/STM32F746xG.ld diff --git a/testhal/STM32/STM32F7xx/SPI/Makefile b/testhal/STM32/STM32F7xx/SPI/Makefile index 1f1d13a97..c783b61db 100644 --- a/testhal/STM32/STM32F7xx/SPI/Makefile +++ b/testhal/STM32/STM32F7xx/SPI/Makefile @@ -104,8 +104,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)/STM32F746xG.ld diff --git a/testhal/STM32/STM32F7xx/SPI/main.c b/testhal/STM32/STM32F7xx/SPI/main.c index c9bc3696e..411020808 100644 --- a/testhal/STM32/STM32F7xx/SPI/main.c +++ b/testhal/STM32/STM32F7xx/SPI/main.c @@ -167,25 +167,15 @@ int main(void) { /* * Starting the transmitter and receiver threads. */ -// chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa), -// NORMALPRIO + 1, spi_thread_1, NULL); -// chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa), -// NORMALPRIO + 1, spi_thread_2, NULL); + chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa), + NORMALPRIO + 1, spi_thread_1, NULL); + chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa), + NORMALPRIO + 1, spi_thread_2, NULL); /* * Normal main() thread activity, in this demo it does nothing. */ - uint8_t byte = 0x55; while (true) { chThdSleepMilliseconds(500); - spiStart(&SPID2, &hs_spicfg); - - spiSelect(&SPID2); - spiSend(&SPID2, 1, &byte); - spiUnselect(&SPID2); - - spiSelect(&SPID2); - spiSend(&SPID2, 1, &byte); - spiUnselect(&SPID2); } } diff --git a/testhal/STM32/STM32F7xx/USB_RAW/Makefile b/testhal/STM32/STM32F7xx/USB_RAW/Makefile index e4da356fd..334e18da9 100644 --- a/testhal/STM32/STM32F7xx/USB_RAW/Makefile +++ b/testhal/STM32/STM32F7xx/USB_RAW/Makefile @@ -103,7 +103,7 @@ 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/lib/test.mk +include $(CHIBIOS)/test/lib/test.mk include $(CHIBIOS)/test/rt/rt_test.mk include $(CHIBIOS)/test/oslib/oslib_test.mk -- cgit v1.2.3