From 50d25f9ad0ed5075e2916505dc02b23124b6531a Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 21 Jun 2020 21:50:41 -0400 Subject: [PATCH] UART DMA for "primary" connector #1528 --- firmware/config/stm32f4ems/efifeatures.h | 11 +++++++---- firmware/config/stm32f4ems/mcuconf.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h index a4463a1adc..7b32d40283 100644 --- a/firmware/config/stm32f4ems/efifeatures.h +++ b/firmware/config/stm32f4ems/efifeatures.h @@ -155,7 +155,8 @@ #define EFI_MCP_3208 FALSE #ifndef EFI_HIP_9011 -#define EFI_HIP_9011 TRUE +// disabling for now - DMA conflict with SPI1 +#define EFI_HIP_9011 FALSE #endif #ifndef EFI_CJ125 @@ -331,9 +332,11 @@ // todo: start using consoleUartDevice? Not sure #ifndef EFI_CONSOLE_SERIAL_DEVICE -#define EFI_CONSOLE_SERIAL_DEVICE (&SD3) +//#define EFI_CONSOLE_SERIAL_DEVICE (&SD3) #endif +#define CONSOLE_UART_DEVICE (&UARTD3) + /** * Use 'HAL_USE_UART' DMA-mode driver instead of 'HAL_USE_SERIAL' * @@ -343,10 +346,10 @@ * in mcuconf.h */ #define TS_UART_DMA_MODE FALSE -#define PRIMARY_UART_DMA_MODE FALSE +#define PRIMARY_UART_DMA_MODE TRUE //#define TS_UART_DEVICE (&UARTD3) -#define TS_SERIAL_DEVICE (&SD3) +//#define TS_SERIAL_DEVICE (&SD3) #define AUX_SERIAL_DEVICE (&SD6) diff --git a/firmware/config/stm32f4ems/mcuconf.h b/firmware/config/stm32f4ems/mcuconf.h index d6299b30c0..a55efcdd9f 100644 --- a/firmware/config/stm32f4ems/mcuconf.h +++ b/firmware/config/stm32f4ems/mcuconf.h @@ -300,7 +300,7 @@ */ #define STM32_SERIAL_USE_USART1 TRUE #define STM32_SERIAL_USE_USART2 TRUE -#define STM32_SERIAL_USE_USART3 TRUE +#define STM32_SERIAL_USE_USART3 FALSE #define STM32_SERIAL_USE_UART4 FALSE #define STM32_SERIAL_USE_UART5 FALSE #define STM32_SERIAL_USE_USART6 TRUE