diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 41fc27b69..640214cd3 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -604,25 +604,25 @@ #endif // External Module -#define EXTMODULE_PWR_GPIO GPIOB -#define EXTMODULE_PWR_GPIO_PIN GPIO_Pin_3 // PB.03 +#define EXTMODULE_PWR_GPIO GPIOB +#define EXTMODULE_PWR_GPIO_PIN GPIO_Pin_3 // PB.03 #if defined(PCBX10) && defined(PCBREV_EXPRESS) - #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) - #define EXTMODULE_RCC_APB1Periph (RCC_APB1Periph_TIM2 | RCC_APB1Periph_USART3) - #define EXTMODULE_RCC_APB2Periph 0 - #define EXTMODULE_TX_GPIO GPIOB - #define EXTMODULE_USART_GPIO EXTMODULE_TX_GPIO - #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PB.10 (TIM2_CH3) - #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource10 - #define EXTMODULE_RX_GPIO_PIN GPIO_Pin_11 // PB.11 - #define EXTMODULE_RX_GPIO_PinSource GPIO_PinSource11 - #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM2 - #define EXTMODULE_TIMER TIM2 + #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) + #define EXTMODULE_RCC_APB1Periph (RCC_APB1Periph_TIM2 | RCC_APB1Periph_USART3) + #define EXTMODULE_RCC_APB2Periph 0 + #define EXTMODULE_TX_GPIO GPIOB + #define EXTMODULE_USART_GPIO EXTMODULE_TX_GPIO + #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PB.10 (TIM2_CH3) + #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource10 + #define EXTMODULE_RX_GPIO_PIN GPIO_Pin_11 // PB.11 + #define EXTMODULE_RX_GPIO_PinSource GPIO_PinSource11 + #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM2 + #define EXTMODULE_TIMER TIM2 #define EXTMODULE_TIMER_32BITS - #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_1 | DMA_SxCR_MSIZE_1) - #define EXTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) - #define EXTMODULE_TIMER_CC_IRQn TIM2_IRQn - #define EXTMODULE_TIMER_IRQHandler TIM2_IRQHandler + #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_1 | DMA_SxCR_MSIZE_1) + #define EXTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) + #define EXTMODULE_TIMER_CC_IRQn TIM2_IRQn + #define EXTMODULE_TIMER_IRQHandler TIM2_IRQHandler #define EXTMODULE_TIMER_DMA_CHANNEL DMA_Channel_3 #define EXTMODULE_TIMER_DMA_STREAM DMA1_Stream1 #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF1 @@ -637,42 +637,42 @@ #define EXTMODULE_USART_RX_DMA_CHANNEL DMA_Channel_4 #define EXTMODULE_USART_RX_DMA_STREAM DMA1_Stream1 #elif defined(PCBX10) || PCBREV >= 13 - #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA2) - #define EXTMODULE_RCC_APB1Periph 0 - #define EXTMODULE_RCC_APB2Periph RCC_APB2Periph_TIM1 - #define EXTMODULE_TX_GPIO GPIOA - #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PA.10 (TIM1_CH3) - #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource10 - #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM1 - #define EXTMODULE_TIMER TIM1 - #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0) - #define EXTMODULE_TIMER_CC_IRQn TIM1_CC_IRQn - #define EXTMODULE_TIMER1_IRQHandler TIM1_CC_IRQHandler - #define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) - #define EXTMODULE_TIMER_DMA_CHANNEL DMA_Channel_6 - #define EXTMODULE_TIMER_DMA_STREAM DMA2_Stream5 - #define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA2_Stream5_IRQn - #define EXTMODULE_TIMER1_DMA_IRQHandler DMA2_Stream5_IRQHandler - #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF5 + #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA2) + #define EXTMODULE_RCC_APB1Periph 0 + #define EXTMODULE_RCC_APB2Periph RCC_APB2Periph_TIM1 + #define EXTMODULE_TX_GPIO GPIOA + #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_10 // PA.10 (TIM1_CH3) + #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource10 + #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM1 + #define EXTMODULE_TIMER TIM1 + #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_0 | DMA_SxCR_MSIZE_0) + #define EXTMODULE_TIMER_CC_IRQn TIM1_CC_IRQn + #define EXTMODULE_TIMER_IRQHandler TIM1_CC_IRQHandler + #define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) + #define EXTMODULE_TIMER_DMA_CHANNEL DMA_Channel_6 + #define EXTMODULE_TIMER_DMA_STREAM DMA2_Stream5 + #define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA2_Stream5_IRQn + #define EXTMODULE_TIMER_DMA_IRQHandler DMA2_Stream5_IRQHandler + #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF5 #else - #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) - #define EXTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM2 - #define EXTMODULE_RCC_APB2Periph 0 - #define EXTMODULE_TX_GPIO GPIOA - #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_15 // PA.15 (TIM2_CH1) - #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource15 - #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM2 - #define EXTMODULE_TIMER TIM2 + #define EXTMODULE_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) + #define EXTMODULE_RCC_APB1Periph RCC_APB1Periph_TIM2 + #define EXTMODULE_RCC_APB2Periph 0 + #define EXTMODULE_TX_GPIO GPIOA + #define EXTMODULE_TX_GPIO_PIN GPIO_Pin_15 // PA.15 (TIM2_CH1) + #define EXTMODULE_TX_GPIO_PinSource GPIO_PinSource15 + #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM2 + #define EXTMODULE_TIMER TIM2 #define EXTMODULE_TIMER_32BITS - #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_1 | DMA_SxCR_MSIZE_1) - #define EXTMODULE_TIMER_CC_IRQn TIM2_IRQn - #define EXTMODULE_TIMER1_IRQHandler TIM2_IRQHandler - #define EXTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) - #define EXTMODULE_TIMER_DMA_CHANNEL DMA_Channel_3 - #define EXTMODULE_TIMER_DMA_STREAM DMA1_Stream7 - #define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA1_Stream7_IRQn - #define EXTMODULE_TIMER1_DMA_IRQHandler DMA1_Stream7_IRQHandler - #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF7 + #define EXTMODULE_TIMER_DMA_SIZE (DMA_SxCR_PSIZE_1 | DMA_SxCR_MSIZE_1) + #define EXTMODULE_TIMER_CC_IRQn TIM2_IRQn + #define EXTMODULE_TIMER_IRQHandler TIM2_IRQHandler + #define EXTMODULE_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) + #define EXTMODULE_TIMER_DMA_CHANNEL DMA_Channel_3 + #define EXTMODULE_TIMER_DMA_STREAM DMA1_Stream7 + #define EXTMODULE_TIMER_DMA_STREAM_IRQn DMA1_Stream7_IRQn + #define EXTMODULE_TIMER_DMA_IRQHandler DMA1_Stream7_IRQHandler + #define EXTMODULE_TIMER_DMA_FLAG_TC DMA_IT_TCIF7 #endif // Heartbeat