From 8821c4ea8c53f7454212f8f6e135ac149a354a64 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Sun, 27 Mar 2022 21:52:00 +0200 Subject: [PATCH] Fix internal module HAL taranis and horus --- .../arm/stm32/intmodule_serial_driver.cpp | 4 +- radio/src/targets/horus/hal.h | 12 ++-- radio/src/targets/taranis/hal.h | 55 +++++++------------ .../taranis/intmodule_pulses_driver.cpp | 5 +- 4 files changed, 29 insertions(+), 47 deletions(-) diff --git a/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp b/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp index 30b381b67..1d50e8895 100755 --- a/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp +++ b/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp @@ -65,7 +65,7 @@ static const LL_GPIO_InitTypeDef intmoduleUSART_PinDef = { .Speed = LL_GPIO_SPEED_FREQ_LOW, .OutputType = LL_GPIO_OUTPUT_PUSHPULL, .Pull = LL_GPIO_PULL_UP, - .Alternate = INTMODULE_GPIO_AF_LL, + .Alternate = INTMODULE_GPIO_AF, }; static const stm32_usart_t intmoduleUSART = { @@ -75,7 +75,7 @@ static const stm32_usart_t intmoduleUSART = { .IRQn = INTMODULE_USART_IRQn, .IRQ_Prio = INTMODULE_USART_IRQ_PRIORITY, .txDMA = INTMODULE_DMA, - .txDMA_Stream = INTMODULE_DMA_STREAM_LL, + .txDMA_Stream = INTMODULE_DMA_STREAM, .txDMA_Channel = INTMODULE_DMA_CHANNEL, .rxDMA = nullptr, .rxDMA_Stream = 0, diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index d18391765..bb4591e21 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -814,18 +814,14 @@ #define INTMODULE_PWR_GPIO GPIOA #define INTMODULE_PWR_GPIO_PIN GPIO_Pin_8 // PA.08 #define INTMODULE_GPIO GPIOB -#define INTMODULE_TX_GPIO_PIN GPIO_Pin_6 // PB.06 -#define INTMODULE_RX_GPIO_PIN GPIO_Pin_7 // PB.07 -#define INTMODULE_GPIO_PinSource_TX GPIO_PinSource6 -#define INTMODULE_GPIO_PinSource_RX GPIO_PinSource7 +#define INTMODULE_TX_GPIO_PIN LL_GPIO_PIN_6 // PB.06 +#define INTMODULE_RX_GPIO_PIN LL_GPIO_PIN_7 // PB.07 #define INTMODULE_USART USART1 -#define INTMODULE_GPIO_AF GPIO_AF_USART1 -#define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 +#define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQn USART1_IRQn #define INTMODULE_USART_IRQHandler USART1_IRQHandler #define INTMODULE_DMA DMA2 -#define INTMODULE_DMA_STREAM DMA2_Stream7 -#define INTMODULE_DMA_STREAM_LL LL_DMA_STREAM_7 +#define INTMODULE_DMA_STREAM LL_DMA_STREAM_7 #define INTMODULE_DMA_STREAM_IRQ DMA2_Stream7_IRQn #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_FLAG_TCIF7 diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 73395945b..9878c7de7 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1359,13 +1359,11 @@ #define INTMODULE_GPIO_PinSource_TX GPIO_PinSource6 #define INTMODULE_GPIO_PinSource_RX GPIO_PinSource7 #define INTMODULE_USART USART1 - #define INTMODULE_GPIO_AF GPIO_AF_USART1 - #define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 + #define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQHandler USART1_IRQHandler #define INTMODULE_USART_IRQn USART1_IRQn #define INTMODULE_DMA DMA2 - #define INTMODULE_DMA_STREAM DMA2_Stream7 - #define INTMODULE_DMA_STREAM_LL LL_DMA_STREAM_7 + #define INTMODULE_DMA_STREAM LL_DMA_STREAM_7 #define INTMODULE_DMA_STREAM_IRQ DMA2_Stream7_IRQn #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF7 @@ -1387,13 +1385,11 @@ #define INTMODULE_GPIO_PinSource_TX GPIO_PinSource6 #define INTMODULE_GPIO_PinSource_RX GPIO_PinSource7 #define INTMODULE_USART USART1 - #define INTMODULE_GPIO_AF GPIO_AF_USART1 - #define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 + #define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQHandler USART1_IRQHandler #define INTMODULE_USART_IRQn USART1_IRQn #define INTMODULE_DMA DMA2 - #define INTMODULE_DMA_STREAM DMA2_Stream7 - #define INTMODULE_DMA_STREAM_LL LL_DMA_STREAM_7 + #define INTMODULE_DMA_STREAM LL_DMA_STREAM_7 #define INTMODULE_DMA_STREAM_IRQ DMA2_Stream7_IRQn #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF7 @@ -1410,13 +1406,11 @@ #define INTMODULE_GPIO_PinSource_TX GPIO_PinSource6 #define INTMODULE_GPIO_PinSource_RX GPIO_PinSource7 #define INTMODULE_USART USART1 - #define INTMODULE_GPIO_AF GPIO_AF_USART1 - #define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 + #define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQHandler USART1_IRQHandler #define INTMODULE_USART_IRQn USART1_IRQn #define INTMODULE_DMA DMA2 - #define INTMODULE_DMA_STREAM DMA2_Stream7 - #define INTMODULE_DMA_STREAM_LL LL_DMA_STREAM_7 + #define INTMODULE_DMA_STREAM LL_DMA_STREAM_7 #define INTMODULE_DMA_STREAM_IRQ DMA2_Stream7_IRQn #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF7 @@ -1433,13 +1427,11 @@ #define INTMODULE_GPIO_PinSource_TX GPIO_PinSource6 #define INTMODULE_GPIO_PinSource_RX GPIO_PinSource7 #define INTMODULE_USART USART1 - #define INTMODULE_GPIO_AF GPIO_AF_USART1 - #define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 + #define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQHandler USART1_IRQHandler #define INTMODULE_USART_IRQn USART1_IRQn #define INTMODULE_DMA DMA2 - #define INTMODULE_DMA_STREAM DMA2_Stream7 - #define INTMODULE_DMA_STREAM_LL LL_DMA_STREAM_7 + #define INTMODULE_DMA_STREAM LL_DMA_STREAM_7 #define INTMODULE_DMA_STREAM_IRQ DMA2_Stream7_IRQn #define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler #define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF7 @@ -1455,17 +1447,15 @@ #define INTMODULE_PWR_GPIO GPIOC #define INTMODULE_PWR_GPIO_PIN GPIO_Pin_6 // PC.06 #define INTMODULE_TX_GPIO GPIOA - #define INTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PA.10 - #define INTMODULE_TX_GPIO_PinSource GPIO_PinSource10 - #define INTMODULE_TX_GPIO_AF GPIO_AF_TIM1 + #define INTMODULE_TX_GPIO_PIN LL_GPIO_PIN_10 // PA.10 + #define INTMODULE_TX_GPIO_AF LL_GPIO_AF_1 #define INTMODULE_TIMER TIM1 #define INTMODULE_TIMER_Channel LL_TIM_CHANNEL_CH3 #define INTMODULE_TIMER_IRQn TIM1_UP_TIM10_IRQn #define INTMODULE_TIMER_IRQHandler TIM1_UP_TIM10_IRQHandler #define INTMODULE_TIMER_DMA DMA2 - #define INTMODULE_TIMER_DMA_CHANNEL DMA_Channel_6 - #define INTMODULE_TIMER_DMA_STREAM_LL LL_DMA_STREAM_5 - #define INTMODULE_TIMER_DMA_STREAM DMA2_Stream5 + #define INTMODULE_TIMER_DMA_CHANNEL LL_DMA_CHANNEL_6 + #define INTMODULE_TIMER_DMA_STREAM LL_DMA_STREAM_5 #define INTMODULE_TIMER_DMA_STREAM_IRQn DMA2_Stream5_IRQn #define INTMODULE_TIMER_DMA_IRQHandler DMA2_Stream5_IRQHandler #define INTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) @@ -1476,19 +1466,16 @@ #define INTMODULE_PWR_GPIO GPIOC #define INTMODULE_PWR_GPIO_PIN GPIO_Pin_6 // PC.06 #define INTMODULE_GPIO GPIOB - #define INTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PB.10 - #define INTMODULE_RX_GPIO_PIN GPIO_Pin_11 // PB.11 - #define INTMODULE_GPIO_PinSource_TX GPIO_PinSource10 - #define INTMODULE_GPIO_PinSource_RX GPIO_PinSource11 + #define INTMODULE_TX_GPIO_PIN LL_GPIO_PIN_10 // PB.10 + #define INTMODULE_RX_GPIO_PIN LL_GPIO_PIN_11 // PB.11 #define INTMODULE_USART USART3 - #define INTMODULE_GPIO_AF GPIO_AF_USART3 - #define INTMODULE_GPIO_AF_LL LL_GPIO_AF_7 + #define INTMODULE_GPIO_AF LL_GPIO_AF_7 #define INTMODULE_USART_IRQn USART3_IRQn #define INTMODULE_USART_IRQHandler USART3_IRQHandler // DMA1_Stream3 is already used by SDIO #define INTMODULE_DMA NULL #define INTMODULE_DMA_CHANNEL 0 - #define INTMODULE_DMA_STREAM_LL 0 + #define INTMODULE_DMA_STREAM 0 #else #define INTMODULE_PULSES #define INTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA2) @@ -1497,17 +1484,15 @@ #define INTMODULE_PWR_GPIO GPIOD #define INTMODULE_PWR_GPIO_PIN GPIO_Pin_15 // PD.15 #define INTMODULE_TX_GPIO GPIOA - #define INTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PA.10 - #define INTMODULE_TX_GPIO_PinSource GPIO_PinSource10 - #define INTMODULE_TX_GPIO_AF GPIO_AF_TIM1 + #define INTMODULE_TX_GPIO_PIN LL_GPIO_PIN_10 // PA.10 + #define INTMODULE_TX_GPIO_AF LL_GPIO_AF_1 #define INTMODULE_TIMER TIM1 #define INTMODULE_TIMER_Channel LL_TIM_CHANNEL_CH3 #define INTMODULE_TIMER_IRQn TIM1_UP_TIM10_IRQn #define INTMODULE_TIMER_IRQHandler TIM1_UP_TIM10_IRQHandler #define INTMODULE_TIMER_DMA DMA2 - #define INTMODULE_TIMER_DMA_CHANNEL DMA_Channel_6 - #define INTMODULE_TIMER_DMA_STREAM_LL LL_DMA_STREAM_5 - #define INTMODULE_TIMER_DMA_STREAM DMA2_Stream5 + #define INTMODULE_TIMER_DMA_CHANNEL LL_DMA_CHANNEL_6 + #define INTMODULE_TIMER_DMA_STREAM LL_DMA_STREAM_5 #define INTMODULE_TIMER_DMA_STREAM_IRQn DMA2_Stream5_IRQn #define INTMODULE_TIMER_DMA_IRQHandler DMA2_Stream5_IRQHandler #define INTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) diff --git a/radio/src/targets/taranis/intmodule_pulses_driver.cpp b/radio/src/targets/taranis/intmodule_pulses_driver.cpp index a6d5b1cc8..8cca72c9a 100644 --- a/radio/src/targets/taranis/intmodule_pulses_driver.cpp +++ b/radio/src/targets/taranis/intmodule_pulses_driver.cpp @@ -22,6 +22,7 @@ #include "stm32_pulse_driver.h" #include "hal.h" +#include "board.h" #include "timers_driver.h" static const stm32_pulse_timer_t intmoduleTimer = { @@ -33,7 +34,7 @@ static const stm32_pulse_timer_t intmoduleTimer = { .TIM_Channel = INTMODULE_TIMER_Channel, .TIM_IRQn = INTMODULE_TIMER_IRQn, .DMAx = INTMODULE_TIMER_DMA, - .DMA_Stream = INTMODULE_TIMER_DMA_STREAM_LL, + .DMA_Stream = INTMODULE_TIMER_DMA_STREAM, .DMA_Channel = INTMODULE_TIMER_DMA_CHANNEL, .DMA_IRQn = INTMODULE_TIMER_DMA_STREAM_IRQn, }; @@ -43,7 +44,7 @@ static_assert(__STM32_PULSE_IS_TIMER_CHANNEL_SUPPORTED(INTMODULE_TIMER_Channel), "Unsupported timer channel"); // Make sure the DMA channel is supported -static_assert(__STM32_PULSE_IS_DMA_STREAM_SUPPORTED(INTMODULE_TIMER_DMA_STREAM_LL), +static_assert(__STM32_PULSE_IS_DMA_STREAM_SUPPORTED(INTMODULE_TIMER_DMA_STREAM), "Unsupported DMA stream"); #if !defined(INTMODULE_TIMER_DMA_IRQHandler)