diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 16:03:57 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-11-04 16:03:57 +0000 |
| commit | e6fbbc4da8ddf97e053651ad3d38802429562a23 (patch) | |
| tree | 4e2f29b4d9d9b034c306cbbc906ddf2f07f2d59e /testhal/STM32/STM32F4xx/DMA_STORM | |
| parent | b8352d5f4b945b307d5850b3bb2259e9ea3c75a8 (diff) | |
| download | ChibiOS-e6fbbc4da8ddf97e053651ad3d38802429562a23.tar.gz ChibiOS-e6fbbc4da8ddf97e053651ad3d38802429562a23.tar.bz2 ChibiOS-e6fbbc4da8ddf97e053651ad3d38802429562a23.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10939 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'testhal/STM32/STM32F4xx/DMA_STORM')
| -rw-r--r-- | testhal/STM32/STM32F4xx/DMA_STORM/Makefile | 4 | ||||
| -rw-r--r-- | testhal/STM32/STM32F4xx/DMA_STORM/main.c | 8 |
2 files changed, 6 insertions, 6 deletions
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,
|