From 475b268883c390ed9ba434c1a1406754a6298be2 Mon Sep 17 00:00:00 2001 From: "@CarlWachter" Date: Sat, 6 Jan 2024 15:18:45 +0100 Subject: [PATCH 1/2] USART via SWD or ASEAG debug --- include/sta/devices/stm32/mcu/STM32F407xx.hpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/sta/devices/stm32/mcu/STM32F407xx.hpp b/include/sta/devices/stm32/mcu/STM32F407xx.hpp index 3e0815c..bc424f9 100644 --- a/include/sta/devices/stm32/mcu/STM32F407xx.hpp +++ b/include/sta/devices/stm32/mcu/STM32F407xx.hpp @@ -7,6 +7,15 @@ #include +// uart setup +#ifdef STA_STM32_USART_ASEAG +# define STA_STM32_USART_HANDLE huart1 +#else +# ifdef defined(STA_STM32_SWD_USART_IDX) +# define STA_STM32_USART_HANDLE huart CONCAT(huart, STA_STM32_SWD_USART_IDX) +# endif // STA_STM32_SWD_USART_IDX +#endif // STA_STM32_SWD_USART_IDX + // Peripheral clock mappings // From 4a52fd40d27cb46a672e5a7aa0b094eb8be3c3c0 Mon Sep 17 00:00:00 2001 From: "@CarlWachter" Date: Sat, 6 Jan 2024 15:58:17 +0100 Subject: [PATCH 2/2] Fixed issues and renamed define --- include/sta/devices/stm32/mcu/STM32F407xx.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sta/devices/stm32/mcu/STM32F407xx.hpp b/include/sta/devices/stm32/mcu/STM32F407xx.hpp index bc424f9..489efa7 100644 --- a/include/sta/devices/stm32/mcu/STM32F407xx.hpp +++ b/include/sta/devices/stm32/mcu/STM32F407xx.hpp @@ -8,11 +8,11 @@ #include // uart setup -#ifdef STA_STM32_USART_ASEAG +#ifdef STA_STM32_ASEAG # define STA_STM32_USART_HANDLE huart1 #else -# ifdef defined(STA_STM32_SWD_USART_IDX) -# define STA_STM32_USART_HANDLE huart CONCAT(huart, STA_STM32_SWD_USART_IDX) +# ifdef STA_STM32_SWD_USART_IDX +# define STA_STM32_USART_HANDLE CONCAT(huart, STA_STM32_SWD_USART_IDX) # endif // STA_STM32_SWD_USART_IDX #endif // STA_STM32_SWD_USART_IDX