fix: peripheral clock handling

EdgeTX · Dec 9, 2023 · eeee419 · eeee419
1 parent f3557b8
commit eeee419
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 8 deletions.
diff --git a/radio/src/targets/common/arm/stm32/stm32_pulse_driver.cpp b/radio/src/targets/common/arm/stm32/stm32_pulse_driver.cpp
@@ -20,6 +20,7 @@
  */
 
 #include "stm32_pulse_driver.h"
+#include "stm32_gpio_driver.h"
 #include "stm32_timer.h"
 #include "stm32_dma.h"
 
@@ -87,6 +88,7 @@ int stm32_pulse_init(const stm32_pulse_timer_t* tim, uint32_t freq)
   pinInit.Pin = tim->GPIO_Pin;
   pinInit.Mode = LL_GPIO_MODE_ALTERNATE;
   pinInit.Alternate = tim->GPIO_Alternate;
+  stm32_gpio_enable_clock(tim->GPIOx);
   LL_GPIO_Init(tim->GPIOx, &pinInit);
 
   LL_TIM_InitTypeDef timInit;

diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp
@@ -59,7 +59,6 @@ void boardInit()
                          SD_RCC_AHB1Periph |
                          AUDIO_RCC_AHB1Periph |
                          TELEMETRY_RCC_AHB1Periph |
-                         TRAINER_RCC_AHB1Periph |
                          BT_RCC_AHB1Periph |
                          AUDIO_RCC_AHB1Periph |
                          HAPTIC_RCC_AHB1Periph |

diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h
@@ -975,7 +975,6 @@
 #endif
 
 // Trainer Port
-#define TRAINER_RCC_AHB1Periph          (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_DMA1)
 #define TRAINER_GPIO                    GPIOC
 
 #define TRAINER_IN_GPIO_PIN             LL_GPIO_PIN_6  // PC.06

diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp
@@ -82,7 +82,6 @@ void delay_self(int count)
                                AUDIO_RCC_AHB1Periph |\
                                MONITOR_RCC_AHB1Periph |\
                                TELEMETRY_RCC_AHB1Periph |\
-                               TRAINER_RCC_AHB1Periph |\
                                AUDIO_RCC_AHB1Periph |\
                                HAPTIC_RCC_AHB1Periph |\
                                INTMODULE_RCC_AHB1Periph |\

diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
@@ -517,7 +517,6 @@
 #define HEARTBEAT_GPIO_PIN              GPIO_Pin_12 // PD.12
 
 // Trainer Port
-#define TRAINER_RCC_AHB1Periph          (RCC_AHB1Periph_GPIOD)
 #define TRAINER_GPIO                    GPIOD
 
 #define TRAINER_IN_GPIO_PIN             LL_GPIO_PIN_12 // PD.12

diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp
@@ -84,7 +84,6 @@ void boardInit()
                          EXTMODULE_RCC_AHB1Periph |
                          TELEMETRY_RCC_AHB1Periph |
                          SPORT_UPDATE_RCC_AHB1Periph |
-                         TRAINER_RCC_AHB1Periph |
                          BT_RCC_AHB1Periph |
                          USB_CHARGER_RCC_AHB1Periph,
                          ENABLE);

diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h
@@ -2121,7 +2121,6 @@
 // Trainer Port
 #if defined(PCBXLITES) || defined(PCBX9LITE)
   // on these 2 radios the trainer port already uses DMA1_Stream6, we won't use the DMA
-  #define TRAINER_RCC_AHB1Periph        RCC_AHB1Periph_GPIOD
   #define TRAINER_GPIO                  GPIOD
   #define TRAINER_IN_GPIO_PIN           LL_GPIO_PIN_13 // PD.13
   #define TRAINER_IN_TIMER_Channel      LL_TIM_CHANNEL_CH2
@@ -2138,11 +2137,9 @@
   #define TRAINER_TIMER_FREQ            (PERI1_FREQUENCY * TIMER_MULT_APB1)
 #elif defined(PCBXLITE)
   #define TRAINER_TIMER                 TIM4
-  #define TRAINER_RCC_AHB1Periph        0
   #define TRAINER_TIMER_IRQn            TIM4_IRQn
   #define TRAINER_TIMER_IRQHandler      TIM4_IRQHandler
 #else
-  #define TRAINER_RCC_AHB1Periph        (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_DMA1)
   #define TRAINER_GPIO                  GPIOC
   #define TRAINER_IN_GPIO_PIN           LL_GPIO_PIN_8  // PC.08
   #define TRAINER_IN_TIMER_Channel      LL_TIM_CHANNEL_CH3