From 563c340ab5aa6cecbd9ff324457a3c39c869648a Mon Sep 17 00:00:00 2001 From: jflyper Date: Sun, 25 Jun 2017 19:40:44 +0900 Subject: [PATCH] Revert to uartStartTxDMA for F7 Also revert target.h for NERO (used for testing) --- src/main/drivers/serial_uart_impl.h | 4 ++++ src/main/target/NERO/target.h | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/drivers/serial_uart_impl.h b/src/main/drivers/serial_uart_impl.h index 24ae7d758..e9cb8dda2 100644 --- a/src/main/drivers/serial_uart_impl.h +++ b/src/main/drivers/serial_uart_impl.h @@ -161,7 +161,11 @@ extern uartDevice_t *uartDevmap[]; extern const struct serialPortVTable uartVTable[]; +#ifdef USE_HAL_DRIVER +void uartStartTxDMA(uartPort_t *s); +#else void uartTryStartTxDMA(uartPort_t *s); +#endif uartPort_t *serialUART(UARTDevice device, uint32_t baudRate, portMode_t mode, portOptions_t options); diff --git a/src/main/target/NERO/target.h b/src/main/target/NERO/target.h index c528c177b..225f3c03c 100644 --- a/src/main/target/NERO/target.h +++ b/src/main/target/NERO/target.h @@ -80,17 +80,14 @@ #define USE_UART1 #define UART1_RX_PIN PA10 #define UART1_TX_PIN PA9 -//#define USE_UART1_TX_DMA #define USE_UART3 #define UART3_RX_PIN PB11 #define UART3_TX_PIN PB10 -//#define USE_UART3_TX_DMA #define USE_UART6 #define UART6_RX_PIN PC7 #define UART6_TX_PIN PC6 -//#define USE_UART6_TX_DMA #define USE_SOFTSERIAL1 #define USE_SOFTSERIAL2