diff options
Diffstat (limited to 'testhal/STM32F37x/UART')
| -rw-r--r-- | testhal/STM32F37x/UART/.project | 2 | ||||
| -rw-r--r-- | testhal/STM32F37x/UART/halconf.h | 4 | ||||
| -rw-r--r-- | testhal/STM32F37x/UART/main.c | 24 | ||||
| -rw-r--r-- | testhal/STM32F37x/UART/mcuconf.h | 10 |
4 files changed, 19 insertions, 21 deletions
diff --git a/testhal/STM32F37x/UART/.project b/testhal/STM32F37x/UART/.project index dfdbbc5df..b1fb421f4 100644 --- a/testhal/STM32F37x/UART/.project +++ b/testhal/STM32F37x/UART/.project @@ -27,7 +27,7 @@ <link>
<name>board</name>
<type>2</type>
- <locationURI>CHIBIOS/boards/ST_STM32373C_EVAL</locationURI>
+ <locationURI>CHIBIOS/os/hal/boards/ST_STM32373C_EVAL</locationURI>
</link>
<link>
<name>os</name>
diff --git a/testhal/STM32F37x/UART/halconf.h b/testhal/STM32F37x/UART/halconf.h index d60800288..dd527aeda 100644 --- a/testhal/STM32F37x/UART/halconf.h +++ b/testhal/STM32F37x/UART/halconf.h @@ -41,7 +41,7 @@ * @brief Enables the ADC subsystem.
*/
#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
-#define HAL_USE_ADC TRUE
+#define HAL_USE_ADC FALSE
#endif
/**
@@ -139,7 +139,7 @@ * @brief Enables the UART subsystem.
*/
#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
-#define HAL_USE_UART FALSE
+#define HAL_USE_UART TRUE
#endif
/**
diff --git a/testhal/STM32F37x/UART/main.c b/testhal/STM32F37x/UART/main.c index 7b9577f8a..ddba3eed7 100644 --- a/testhal/STM32F37x/UART/main.c +++ b/testhal/STM32F37x/UART/main.c @@ -17,15 +17,15 @@ #include "ch.h"
#include "hal.h"
-static VirtualTimer vt1, vt2;
+static virtual_timer_t vt1, vt2;
static void restart(void *p) {
(void)p;
- chSysLockFromIsr();
+ chSysLockFromISR();
uartStartSendI(&UARTD2, 14, "Hello World!\r\n");
- chSysUnlockFromIsr();
+ chSysUnlockFromISR();
}
static void ledoff(void *p) {
@@ -51,11 +51,10 @@ static void txend2(UARTDriver *uartp) { (void)uartp;
palSetPad(GPIOC, GPIOC_LED1);
- chSysLockFromIsr();
- if (chVTIsArmedI(&vt1))
- chVTResetI(&vt1);
- chVTSetI(&vt1, MS2ST(5000), restart, NULL);
- chSysUnlockFromIsr();
+ chSysLockFromISR();
+ chVTResetI(&vt1);
+ chVTDoSetI(&vt1, MS2ST(5000), restart, NULL);
+ chSysUnlockFromISR();
}
/*
@@ -78,11 +77,10 @@ static void rxchar(UARTDriver *uartp, uint16_t c) { (void)c;
/* Flashing the LED each time a character is received.*/
palClearPad(GPIOC, GPIOC_LED1);
- chSysLockFromIsr();
- if (chVTIsArmedI(&vt2))
- chVTResetI(&vt2);
- chVTSetI(&vt2, MS2ST(200), ledoff, NULL);
- chSysUnlockFromIsr();
+ chSysLockFromISR();
+ chVTResetI(&vt2);
+ chVTDoSetI(&vt2, MS2ST(200), ledoff, NULL);
+ chSysUnlockFromISR();
}
/*
diff --git a/testhal/STM32F37x/UART/mcuconf.h b/testhal/STM32F37x/UART/mcuconf.h index f2e3e3def..1ce2fb303 100644 --- a/testhal/STM32F37x/UART/mcuconf.h +++ b/testhal/STM32F37x/UART/mcuconf.h @@ -62,7 +62,7 @@ /*
* ADC driver system settings.
*/
-#define STM32_ADC_USE_ADC1 TRUE
+#define STM32_ADC_USE_ADC1 FALSE
#define STM32_ADC_USE_SDADC1 FALSE
#define STM32_ADC_USE_SDADC2 FALSE
#define STM32_ADC_USE_SDADC3 FALSE
@@ -81,7 +81,7 @@ /*
* CAN driver system settings.
*/
-#define STM32_CAN_USE_CAN1 TRUE
+#define STM32_CAN_USE_CAN1 FALSE
#define STM32_CAN_CAN1_IRQ_PRIORITY 11
/*
@@ -195,9 +195,9 @@ /*
* UART driver system settings.
*/
-#define STM32_UART_USE_USART1 FALSE
-#define STM32_UART_USE_USART2 FALSE
-#define STM32_UART_USE_USART3 FALSE
+#define STM32_UART_USE_USART1 TRUE
+#define STM32_UART_USE_USART2 TRUE
+#define STM32_UART_USE_USART3 TRUE
#define STM32_UART_USART1_IRQ_PRIORITY 12
#define STM32_UART_USART2_IRQ_PRIORITY 12
#define STM32_UART_USART3_IRQ_PRIORITY 12
|