From b1609eb4845ab3789f474123d501719f83395982 Mon Sep 17 00:00:00 2001 From: 3djc Date: Fri, 14 Jul 2023 10:25:59 +0200 Subject: [PATCH] chore: Clean HAL (1 of many) (#3790) * chore: clean hal (phase 1 of many) * chore: clean hal : remove KEYS_RCC_AHB1Periph * chore: clean hal : remove AUX(2)_SERIAL_RCC_AHB1Periph * chore: clean hal : remove ADC_RCC --- radio/src/boards/generic_stm32/aux_ports.cpp | 2 + .../common/arm/stm32/bootloader/boot.cpp | 5 +- radio/src/targets/horus/board.cpp | 9 - radio/src/targets/horus/hal.h | 39 ---- radio/src/targets/nv14/board.cpp | 6 +- radio/src/targets/nv14/hal.h | 11 -- radio/src/targets/taranis/board.cpp | 5 - radio/src/targets/taranis/hal.h | 178 ------------------ 8 files changed, 5 insertions(+), 250 deletions(-) diff --git a/radio/src/boards/generic_stm32/aux_ports.cpp b/radio/src/boards/generic_stm32/aux_ports.cpp index a006334fa..d730de382 100644 --- a/radio/src/boards/generic_stm32/aux_ports.cpp +++ b/radio/src/boards/generic_stm32/aux_ports.cpp @@ -21,6 +21,7 @@ #include "hal/serial_port.h" #include "stm32_serial_driver.h" +#include "stm32_gpio_driver.h" #include "board.h" #include "dataconstants.h" @@ -35,6 +36,7 @@ #if defined(AUX_SERIAL_PWR_GPIO) || defined(AUX2_SERIAL_PWR_GPIO) static void _aux_pwr(GPIO_TypeDef *GPIOx, uint32_t pin, uint8_t on) { + stm32_gpio_enable_clock(GPIOx); LL_GPIO_InitTypeDef pinInit; LL_GPIO_StructInit(&pinInit); pinInit.Pin = pin; diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp index 48e0d0038..e836e0c95 100644 --- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp +++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp @@ -219,10 +219,8 @@ void writeEepromBlock() #if !defined(SIMU) void bootloaderInitApp() { - RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph | KEYS_RCC_AHB1Periph | + RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph | LCD_RCC_AHB1Periph | BACKLIGHT_RCC_AHB1Periph | - AUX_SERIAL_RCC_AHB1Periph | - AUX2_SERIAL_RCC_AHB1Periph | KEYS_BACKLIGHT_RCC_AHB1Periph | SD_RCC_AHB1Periph, ENABLE); @@ -276,6 +274,7 @@ void bootloaderInitApp() if (readTrims() != BOOTLOADER_KEYS) { #endif #endif + // TODO: deInit before restarting // Start main application jumpTo(APP_START_ADDRESS); } diff --git a/radio/src/targets/horus/board.cpp b/radio/src/targets/horus/board.cpp index beddbf399..a9e1204c0 100644 --- a/radio/src/targets/horus/board.cpp +++ b/radio/src/targets/horus/board.cpp @@ -97,13 +97,6 @@ void boardInit() KEYS_BACKLIGHT_RCC_AHB1Periph | SD_RCC_AHB1Periph | AUDIO_RCC_AHB1Periph | - KEYS_RCC_AHB1Periph | - ADC_RCC_AHB1Periph | -#if defined(RADIO_FAMILY_T16) - FLYSKY_HALL_RCC_AHB1Periph | -#endif - AUX_SERIAL_RCC_AHB1Periph | - AUX2_SERIAL_RCC_AHB1Periph | TELEMETRY_RCC_AHB1Periph | TRAINER_RCC_AHB1Periph | BT_RCC_AHB1Periph | @@ -116,7 +109,6 @@ void boardInit() RCC_APB1PeriphClockCmd(ROTARY_ENCODER_RCC_APB1Periph | INTERRUPT_xMS_RCC_APB1Periph | - ADC_RCC_APB1Periph | TIMER_2MHz_RCC_APB1Periph | AUDIO_RCC_APB1Periph | #if defined(RADIO_FAMILY_T16) @@ -130,7 +122,6 @@ void boardInit() RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG | LCD_RCC_APB2Periph | - ADC_RCC_APB2Periph | HAPTIC_RCC_APB2Periph | TELEMETRY_RCC_APB2Periph | BT_RCC_APB2Periph | diff --git a/radio/src/targets/horus/hal.h b/radio/src/targets/horus/hal.h index 9c320b896..b0ff9228b 100644 --- a/radio/src/targets/horus/hal.h +++ b/radio/src/targets/horus/hal.h @@ -31,7 +31,6 @@ #define TELEMETRY_EXTI_PRIO 0 // required for soft serial // Keys -#define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_GPIOI | RCC_AHB1Periph_GPIOJ) #if defined(PCBX12S) #define KEYS_GPIO_REG_PAGEUP GPIOC #define KEYS_GPIO_PIN_PAGEUP LL_GPIO_PIN_13 // PC.13 @@ -245,41 +244,9 @@ #define TRIMS_GPIO_PIN_RSD LL_GPIO_PIN_13 // PB.13 #endif -// Index of all keys -#if defined(PCBX12S) - #define KEYS_GPIOB_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOC_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_4 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_13) - #define KEYS_GPIOE_PINS (GPIO_Pin_3) - #define KEYS_GPIOG_PINS (KEYS_GPIO_PIN_UP | SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | TRIMS_GPIO_PIN_RVD) - #define KEYS_GPIOH_PINS (GPIO_Pin_9 | GPIO_Pin_12 | SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_F | ROTARY_ENCODER_GPIO_PIN_A | ROTARY_ENCODER_GPIO_PIN_B) - #define KEYS_GPIOI_PINS (KEYS_GPIO_PIN_PAGEDN | KEYS_GPIO_PIN_LEFT | KEYS_GPIO_PIN_DOWN | SWITCHES_GPIO_PIN_A_L | GPIO_Pin_4) - #define KEYS_GPIOJ_PINS (SWITCHES_GPIO_PIN_D_H | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_RSD) -#elif defined(PCBX10) - #if defined(RADIO_TX16S) - #define KEYS_GPIOB_PINS (GPIO_Pin_12 | GPIO_Pin_15 | GPIO_Pin_14 | GPIO_Pin_13) - #else - #define KEYS_GPIOB_PINS (GPIO_Pin_12 | GPIO_Pin_15 | GPIO_Pin_14 | GPIO_Pin_13 | GPIO_Pin_8 | GPIO_Pin_9) - #endif - #define KEYS_GPIOD_PINS (GPIO_Pin_11 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_13) - #define KEYS_GPIOE_PINS (GPIO_Pin_3) - #define KEYS_GPIOG_PINS (SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | TRIMS_GPIO_PIN_LVD) -#if defined(RADIO_TX16S) - #define KEYS_GPIOA_PINS (GPIO_Pin_6) - #define KEYS_GPIOC_PINS (GPIO_Pin_4 | GPIO_Pin_13) - #define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15) -#else - #define KEYS_GPIOH_PINS (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_14 | GPIO_Pin_15) -#endif - #define KEYS_GPIOI_PINS (GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_11 | GPIO_Pin_15) - #define KEYS_GPIOJ_PINS (SWITCHES_GPIO_PIN_D_H | TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | GPIO_Pin_8) -#endif // ADC #if defined(PCBX12S) - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph (RCC_APB2Periph_SPI4) #define ADC_SPI SPI4 #define ADC_SPI_GPIO GPIOE #define ADC_SPI_GPIO_AF LL_GPIO_AF_5 @@ -320,9 +287,6 @@ #define ADC_SAMPTIME LL_ADC_SAMPLINGTIME_56CYCLES #define ADC_VREF_PREC2 600 #elif defined(PCBX10) - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph (RCC_APB1Periph_TIM5) - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_3 // PA.03 @@ -477,7 +441,6 @@ // Serial Port (DEBUG) #if defined(AUX_SERIAL) - #define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) #define AUX_SERIAL_GPIO GPIOB #define AUX_SERIAL_GPIO_PIN_TX GPIO_Pin_10 // PB.10 #define AUX_SERIAL_GPIO_PIN_RX GPIO_Pin_11 // PB.11 @@ -500,8 +463,6 @@ #define AUX_SERIAL_PWR_GPIO GPIOA #define AUX_SERIAL_PWR_GPIO_PIN GPIO_Pin_15 // PA.15 #endif -#else - #define AUX_SERIAL_RCC_AHB1Periph 0 #endif #if defined(AUX2_SERIAL) diff --git a/radio/src/targets/nv14/board.cpp b/radio/src/targets/nv14/board.cpp index 74d43c61b..a9a6443d9 100644 --- a/radio/src/targets/nv14/board.cpp +++ b/radio/src/targets/nv14/board.cpp @@ -117,9 +117,6 @@ void delay_self(int count) #define RCC_AHB1PeriphOther (SD_RCC_AHB1Periph |\ AUDIO_RCC_AHB1Periph |\ MONITOR_RCC_AHB1Periph |\ - KEYS_RCC_AHB1Periph |\ - ADC_RCC_AHB1Periph |\ - AUX_SERIAL_RCC_AHB1Periph |\ TELEMETRY_RCC_AHB1Periph |\ TRAINER_RCC_AHB1Periph |\ AUDIO_RCC_AHB1Periph |\ @@ -141,8 +138,7 @@ void delay_self(int count) ) #define RCC_APB2PeriphMinimum (LCD_RCC_APB2Periph) -#define RCC_APB2PeriphOther (ADC_RCC_APB2Periph |\ - HAPTIC_RCC_APB2Periph |\ +#define RCC_APB2PeriphOther (HAPTIC_RCC_APB2Periph |\ AUDIO_RCC_APB2Periph \ ) diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h index 44004d47c..ffc892117 100644 --- a/radio/src/targets/nv14/hal.h +++ b/radio/src/targets/nv14/hal.h @@ -97,20 +97,10 @@ #define STORAGE_SWITCH_H // Index of all switches / trims -#define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOG | RCC_AHB1Periph_GPIOH | RCC_AHB1Periph_GPIOJ) -#define KEYS_GPIOB_PINS (GPIO_Pin_15) -#define KEYS_GPIOC_PINS (GPIO_Pin_13) -#define KEYS_GPIOD_PINS (GPIO_Pin_7) -#define KEYS_GPIOG_PINS (GPIO_Pin_2 | GPIO_Pin_10 | GPIO_Pin_11) -#define KEYS_GPIOH_PINS (GPIO_Pin_2 | GPIO_Pin_7) -#define KEYS_GPIOJ_PINS (GPIO_Pin_0 | GPIO_Pin_12) - #define KEYS_GPIO_ACTIVE_HIGH #define TRIMS_GPIO_ACTIVE_HIGH // ADC -#define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) -#define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_LH #define ADC_GPIO_PIN_STICK_LV @@ -201,7 +191,6 @@ // Serial Port (DEBUG) // We will temporarily used the PPM and the HEARTBEAT PINS -#define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOE) #define AUX_SERIAL_GPIO GPIOC #define AUX_SERIAL_GPIO_PIN_TX GPIO_Pin_6 // PC.06 #define AUX_SERIAL_GPIO_PIN_RX GPIO_Pin_7 // PC.07 diff --git a/radio/src/targets/taranis/board.cpp b/radio/src/targets/taranis/board.cpp index 82711ebc6..b700f53aa 100644 --- a/radio/src/targets/taranis/board.cpp +++ b/radio/src/targets/taranis/board.cpp @@ -85,18 +85,15 @@ void boardInit() { RCC_AHB1PeriphClockCmd(PWR_RCC_AHB1Periph | PCBREV_RCC_AHB1Periph | - KEYS_RCC_AHB1Periph | LCD_RCC_AHB1Periph | AUDIO_RCC_AHB1Periph | BACKLIGHT_RCC_AHB1Periph | - ADC_RCC_AHB1Periph | SD_RCC_AHB1Periph | HAPTIC_RCC_AHB1Periph | INTMODULE_RCC_AHB1Periph | EXTMODULE_RCC_AHB1Periph | TELEMETRY_RCC_AHB1Periph | SPORT_UPDATE_RCC_AHB1Periph | - AUX_SERIAL_RCC_AHB1Periph | TRAINER_RCC_AHB1Periph | BT_RCC_AHB1Periph | USB_CHARGER_RCC_AHB1Periph, @@ -105,7 +102,6 @@ void boardInit() RCC_APB1PeriphClockCmd(ROTARY_ENCODER_RCC_APB1Periph | LCD_RCC_APB1Periph | AUDIO_RCC_APB1Periph | - ADC_RCC_APB1Periph | BACKLIGHT_RCC_APB1Periph | HAPTIC_RCC_APB1Periph | INTERRUPT_xMS_RCC_APB1Periph | @@ -118,7 +114,6 @@ void boardInit() RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG | BACKLIGHT_RCC_APB2Periph | - ADC_RCC_APB2Periph | HAPTIC_RCC_APB2Periph | BT_RCC_APB2Periph | TELEMETRY_RCC_APB2Periph, diff --git a/radio/src/targets/taranis/hal.h b/radio/src/targets/taranis/hal.h index 0d4737bf8..9e0b40eeb 100644 --- a/radio/src/targets/taranis/hal.h +++ b/radio/src/targets/taranis/hal.h @@ -1228,149 +1228,6 @@ #define SWITCHES_GPIO_PIN_R_L LL_GPIO_PIN_0 // PE.00 #endif -#if defined(PCBX9E) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE|RCC_AHB1Periph_GPIOF|RCC_AHB1Periph_GPIOG) - #define KEYS_GPIOA_PINS (SWITCHES_GPIO_PIN_M_L) - #define KEYS_GPIOB_PINS (SWITCHES_GPIO_PIN_N_H | SWITCHES_GPIO_PIN_N_L | SWITCHES_GPIO_PIN_R_H) - #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_PAGE | SWITCHES_GPIO_PIN_A_H | SWITCHES_GPIO_PIN_A_L | ROTARY_ENCODER_GPIO_PIN_A | ROTARY_ENCODER_GPIO_PIN_B) - #define KEYS_GPIOE_PINS (TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_LVD | SWITCHES_GPIO_PIN_D_H | SWITCHES_GPIO_PIN_D_L| SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_E_L | SWITCHES_GPIO_PIN_F | SWITCHES_GPIO_PIN_I_L | SWITCHES_GPIO_PIN_L_H | SWITCHES_GPIO_PIN_L_L | SWITCHES_GPIO_PIN_M_H | SWITCHES_GPIO_PIN_O_L | SWITCHES_GPIO_PIN_R_L) - #define KEYS_GPIOF_PINS (KEYS_GPIO_PIN_ENTER | SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_C_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H | SWITCHES_GPIO_PIN_I_H | SWITCHES_GPIO_PIN_O_H | SWITCHES_GPIO_PIN_P_H | SWITCHES_GPIO_PIN_P_L | SWITCHES_GPIO_PIN_Q_H | SWITCHES_GPIO_PIN_Q_L) - #define KEYS_GPIOG_PINS (TRIMS_GPIO_PIN_LHL | TRIMS_GPIO_PIN_LHR| SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_J_H | SWITCHES_GPIO_PIN_J_L | SWITCHES_GPIO_PIN_K_H | SWITCHES_GPIO_PIN_K_L) -#elif defined(RADIO_X9DP2019) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_5) - #define KEYS_GPIOB_PINS (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_10 | GPIO_Pin_14) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(PCBX9DP) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (SWITCHES_GPIO_PIN_C_L) - #define KEYS_GPIOB_PINS (SWITCHES_GPIO_PIN_E_L | SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_A_H) - #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_PAGE | SWITCHES_GPIO_PIN_H) - #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_PLUS | KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_MINUS | TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LHL | TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | SWITCHES_GPIO_PIN_F | SWITCHES_GPIO_PIN_A_L | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_D_H | SWITCHES_GPIO_PIN_D_L | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L) -#elif defined(PCBXLITES) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_5 | GPIO_Pin_6) - #define KEYS_GPIOB_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_5 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14) -#elif defined(PCBXLITE) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_5 | GPIO_Pin_6) - #define KEYS_GPIOB_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14) -#elif defined(RADIO_TPROV2) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG) - #define KEYS_GPIOA_PINS (GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOG_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7) -#elif defined(RADIO_TPRO) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOG) - #define KEYS_GPIOA_PINS (GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOG_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7) -#elif defined(RADIO_T20) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE | RCC_AHB1Periph_GPIOF | RCC_AHB1Periph_GPIOG) - #define KEYS_GPIOA_PINS () - #define KEYS_GPIOB_PINS (SWITCHES_GPIO_PIN_F | TRIMS_GPIO_PIN_T7L | TRIMS_GPIO_PIN_T8U) - #define KEYS_GPIOC_PINS (SWITCHES_GPIO_PIN_C) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_PAGE | KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | TRIMS_GPIO_PIN_LHL | TRIMS_GPIO_PIN_LVU | SWITCHES_GPIO_PIN_A_L | SWITCHES_GPIO_PIN_A_H | SWITCHES_GPIO_PIN_G | TRIMS_GPIO_PIN_RSD) - #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_ENTER | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RVU | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_D | SWITCHES_GPIO_PIN_E | SWITCHES_GPIO_PIN_K | SWITCHES_GPIO_PIN_L | SWITCHES_GPIO_PIN_M | SWITCHES_GPIO_PIN_N | SWITCHES_GPIO_PIN_O | SWITCHES_GPIO_PIN_P) - #define KEYS_GPIOF_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RHR | SWITCHES_GPIO_PIN_H) - #define KEYS_GPIOG_PINS (TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LVD | SWITCHES_GPIO_PIN_I | SWITCHES_GPIO_PIN_J | TRIMS_GPIO_PIN_LSD | TRIMS_GPIO_PIN_LSU | TRIMS_GPIO_PIN_RSU | TRIMS_GPIO_PIN_T7R | TRIMS_GPIO_PIN_T8D) -#elif defined(RADIO_FAMILY_JUMPER_T12) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) -#if !defined(RADIO_TLITE) - #define KEYS_GPIOA_PINS GPIO_Pin_5 -#endif - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(RADIO_ZORRO) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (KEYS_GPIO_PIN_ENTER | SWITCHES_GPIO_PIN_B_H) - #define KEYS_GPIOB_PINS (KEYS_GPIO_PIN_SYS) - #define KEYS_GPIOC_PINS (KEYS_GPIO_PIN_EXIT | TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | SWITCHES_GPIO_PIN_A) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_PAGEUP | KEYS_GPIO_PIN_PAGEDN | KEYS_GPIO_PIN_TELE | TRIMS_GPIO_PIN_LHL |SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_H) - #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_MDL | TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_C_L | SWITCHES_GPIO_PIN_D | SWITCHES_GPIO_PIN_E | SWITCHES_GPIO_PIN_F | SWITCHES_GPIO_PIN_G | ROTARY_ENCODER_GPIO_PIN_A | ROTARY_ENCODER_GPIO_PIN_B) -#elif defined(RADIO_TX12) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_13 | GPIO_Pin_5) - #define KEYS_GPIOB_PINS (GPIO_Pin_3 | GPIO_Pin_4) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3|GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 |GPIO_Pin_8| GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(RADIO_TX12MK2) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_10 | GPIO_Pin_5) - #define KEYS_GPIOB_PINS (GPIO_Pin_4) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_5 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(RADIO_BOXER) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_10) - #define KEYS_GPIOB_PINS (GPIO_Pin_4) - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_5 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(RADIO_T8) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_BIND) - #define KEYS_GPIOB_PINS (KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_SYS) - #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RVD) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_PAGEUP | KEYS_GPIO_PIN_PAGEDN | SWITCHES_GPIO_PIN_D | TRIMS_GPIO_PIN_LHL) - #define KEYS_GPIOE_PINS (SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_C_L | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR | TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_LVD | SWITCHES_GPIO_PIN_B_L | KEYS_GPIO_PIN_PLUS | KEYS_GPIO_PIN_MINUS | KEYS_GPIO_PIN_MDL | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_A) -#elif defined(RADIO_COMMANDO8) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (SWITCHES_GPIO_PIN_D |SWITCHES_GPIO_PIN_C_H) - #define KEYS_GPIOB_PINS (0) - #define KEYS_GPIOC_PINS (SWITCHES_GPIO_PIN_C_L | TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RVD) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_MDL |KEYS_GPIO_PIN_SYS| TRIMS_GPIO_PIN_LHL|KEYS_GPIO_PIN_BIND) - #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_PAGEUP | KEYS_GPIO_PIN_PAGEDN | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR | TRIMS_GPIO_PIN_LVU | TRIMS_GPIO_PIN_LVD | SWITCHES_GPIO_PIN_B_L | KEYS_GPIO_PIN_PLUS | KEYS_GPIO_PIN_MINUS | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_A) -#elif defined(RADIO_X7ACCESS) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS GPIO_Pin_5 - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(RADIO_X7) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS GPIO_Pin_5 - #define KEYS_GPIOC_PINS (GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_14 | GPIO_Pin_15) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_13 | GPIO_Pin_14 | GPIO_Pin_15) -#elif defined(PCBX9LITES) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_5) - #define KEYS_GPIOB_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_8 | GPIO_Pin_9) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14) -#elif defined(PCBX9LITE) - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (GPIO_Pin_5) - #define KEYS_GPIOB_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_4 | GPIO_Pin_5) - #define KEYS_GPIOC_PINS (GPIO_Pin_4 | GPIO_Pin_5 | GPIO_Pin_13) - #define KEYS_GPIOD_PINS (GPIO_Pin_8 | GPIO_Pin_9) - #define KEYS_GPIOE_PINS (GPIO_Pin_0 | GPIO_Pin_1 | GPIO_Pin_2 | GPIO_Pin_3 | GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_10 | GPIO_Pin_11 | GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_14) -#else - #define KEYS_RCC_AHB1Periph (RCC_AHB1Periph_GPIOA|RCC_AHB1Periph_GPIOB|RCC_AHB1Periph_GPIOC|RCC_AHB1Periph_GPIOD|RCC_AHB1Periph_GPIOE) - #define KEYS_GPIOA_PINS (SWITCHES_GPIO_PIN_C_L) - #define KEYS_GPIOB_PINS (SWITCHES_GPIO_PIN_E_L | SWITCHES_GPIO_PIN_E_H | SWITCHES_GPIO_PIN_A_H | SWITCHES_GPIO_PIN_D_L) - #define KEYS_GPIOC_PINS (TRIMS_GPIO_PIN_RVD | TRIMS_GPIO_PIN_RVU | TRIMS_GPIO_PIN_RHL | TRIMS_GPIO_PIN_RHR) - #define KEYS_GPIOD_PINS (KEYS_GPIO_PIN_MENU | KEYS_GPIO_PIN_EXIT | KEYS_GPIO_PIN_PAGE) - #define KEYS_GPIOE_PINS (KEYS_GPIO_PIN_PLUS | KEYS_GPIO_PIN_ENTER | KEYS_GPIO_PIN_MINUS | TRIMS_GPIO_PIN_LHR | TRIMS_GPIO_PIN_LHL | TRIMS_GPIO_PIN_LVD | TRIMS_GPIO_PIN_LVU | SWITCHES_GPIO_PIN_F | SWITCHES_GPIO_PIN_A_L | SWITCHES_GPIO_PIN_B_H | SWITCHES_GPIO_PIN_B_L | SWITCHES_GPIO_PIN_C_H | SWITCHES_GPIO_PIN_D_H | SWITCHES_GPIO_PIN_G_H | SWITCHES_GPIO_PIN_G_L | SWITCHES_GPIO_PIN_H) -#endif - // ADC #if !defined(RADIO_T20) #define ADC_MAIN ADC1 @@ -1389,9 +1246,6 @@ #define HARDWARE_POT2 #define HARDWARE_POT3 #define HARDWARE_POT4 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_2 // PA.02 @@ -1435,9 +1289,6 @@ #define HARDWARE_POT1 #define HARDWARE_POT2 #define HARDWARE_POT3 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_2 // PA.02 @@ -1471,9 +1322,6 @@ #elif defined(PCBXLITE) #define HARDWARE_POT1 #define HARDWARE_POT2 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph RCC_APB1Periph_TIM5 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_3 // PA.03 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_2 // PA.02 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 @@ -1504,9 +1352,6 @@ #define ADC_VREF_PREC2 330 #elif defined(RADIO_T8) // No pots - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_2 // PA.02 @@ -1522,9 +1367,6 @@ #define ADC_CHANNEL_BATT LL_ADC_CHANNEL_10 #define ADC_VREF_PREC2 300 #elif defined(RADIO_COMMANDO8) - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph RCC_APB1Periph_TIM5 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_2 // PA.02 @@ -1551,9 +1393,6 @@ #define STICK_PWM_CHANNEL_RV 2 #define STICK_PWM_CHANNEL_RH 3 #elif defined(RADIO_TLITE) || defined(RADIO_LR3PRO) - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_2 // PA.02 @@ -1571,9 +1410,6 @@ #elif defined(RADIO_TPRO) || defined(RADIO_TPROV2) #define HARDWARE_POT1 #define HARDWARE_POT2 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_2 // PA.02 @@ -1593,9 +1429,6 @@ #define ADC_CHANNEL_BATT LL_ADC_CHANNEL_10 #define ADC_VREF_PREC2 330 #elif defined(RADIO_T20) - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_MAIN ADC3 #define ADC_DMA DMA2 #define ADC_DMA_CHANNEL LL_DMA_CHANNEL_2 @@ -1634,9 +1467,6 @@ #elif defined(PCBX7) #define HARDWARE_POT1 #define HARDWARE_POT2 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_2 // PA.02 @@ -1665,9 +1495,6 @@ #define ADC_VREF_PREC2 330 #elif defined(PCBX9LITE) #define HARDWARE_POT1 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_LV LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_2 // PA.02 @@ -1686,9 +1513,6 @@ #else #define HARDWARE_POT1 #define HARDWARE_POT2 - #define ADC_RCC_AHB1Periph (RCC_AHB1Periph_DMA2) - #define ADC_RCC_APB1Periph 0 - #define ADC_RCC_APB2Periph 0 #define ADC_GPIO_PIN_STICK_RV LL_GPIO_PIN_0 // PA.00 #define ADC_GPIO_PIN_STICK_RH LL_GPIO_PIN_1 // PA.01 #define ADC_GPIO_PIN_STICK_LH LL_GPIO_PIN_2 // PA.02 @@ -2262,10 +2086,8 @@ // Serial Port #if (defined(PCBX7) && !defined(RADIO_ZORRO) && !defined(RADIO_TX12MK2)) && !defined(RADIO_BOXER) || defined(PCBXLITE) || defined(PCBX9LITE) || defined(RADIO_X9DP2019) - #define AUX_SERIAL_RCC_AHB1Periph 0 #else #define HARDWARE_TRAINER_AUX_SERIAL - #define AUX_SERIAL_RCC_AHB1Periph (RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_DMA1) #define AUX_SERIAL_GPIO GPIOB #define AUX_SERIAL_GPIO_PIN_TX GPIO_Pin_10 // PB.10 #define AUX_SERIAL_GPIO_PIN_RX GPIO_Pin_11 // PB.11