From 2eafefdf32ce0313f04e850ec2afc2d28c75158d Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 21 Mar 2022 06:08:23 +0100 Subject: [PATCH] NV14: fixed EXTMODULE_TIMER_IRQ definitions And moved mixer scheduler timer to TIM12 (as with Taranis) --- radio/src/targets/nv14/hal.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h index f37e26f8a..61a5e71d3 100644 --- a/radio/src/targets/nv14/hal.h +++ b/radio/src/targets/nv14/hal.h @@ -439,9 +439,8 @@ #define EXTMODULE_RX_GPIO_AF_USART GPIO_AF_USART6 #define EXTMODULE_TIMER TIM8 #define EXTMODULE_TIMER_Channel LL_TIM_CHANNEL_CH1 -#define EXTMODULE_TIMER_IRQn TIM8_CC_IRQn -#define EXTMODULE_TIMER_CC_IRQn TIM8_CC_IRQn -#define EXTMODULE_TIMER_IRQHandler TIM8_CC_IRQHandler +#define EXTMODULE_TIMER_IRQn TIM8_UP_TIM13_IRQn +#define EXTMODULE_TIMER_IRQHandler TIM8_UP_TIM13_IRQHandler #define EXTMODULE_TIMER_FREQ (PERI2_FREQUENCY * TIMER_MULT_APB2) #define EXTMODULE_TIMER_TX_GPIO_AF GPIO_AF_TIM8 //USART @@ -561,10 +560,10 @@ #define TIMER_2MHz_TIMER TIM7 // Mixer scheduler timer -#define MIXER_SCHEDULER_TIMER_RCC_APB1Periph RCC_APB1Periph_TIM13 -#define MIXER_SCHEDULER_TIMER TIM13 +#define MIXER_SCHEDULER_TIMER_RCC_APB1Periph RCC_APB1Periph_TIM12 +#define MIXER_SCHEDULER_TIMER TIM12 #define MIXER_SCHEDULER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) -#define MIXER_SCHEDULER_TIMER_IRQn TIM8_UP_TIM13_IRQn -#define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_UP_TIM13_IRQHandler +#define MIXER_SCHEDULER_TIMER_IRQn TIM8_BRK_TIM12_IRQn +#define MIXER_SCHEDULER_TIMER_IRQHandler TIM8_BRK_TIM12_IRQHandler #endif // _HAL_H_