diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h index 3b612127f..dbc9a9564 100644 --- a/radio/src/targets/nv14/board.h +++ b/radio/src/targets/nv14/board.h @@ -98,8 +98,8 @@ extern HardwareOptions hardwareOptions; #define EXTERNAL_MODULE_ON() GPIO_SetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) #define EXTERNAL_MODULE_OFF() GPIO_ResetBits(EXTMODULE_PWR_GPIO, EXTMODULE_PWR_GPIO_PIN) -#define BLUETOOTH_MODULE_ON() GPIO_ResetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN) -#define BLUETOOTH_MODULE_OFF() GPIO_SetBits(BLUETOOTH_ON_GPIO, BLUETOOTH_ON_GPIO_PIN) +#define BLUETOOTH_MODULE_ON() GPIO_ResetBits(BT_EN_GPIO, BT_EN_GPIO_PIN) +#define BLUETOOTH_MODULE_OFF() GPIO_SetBits(BT_EN_GPIO, BT_EN_GPIO_PIN) #else diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h index 3552205f7..1d26fdda6 100644 --- a/radio/src/targets/nv14/hal.h +++ b/radio/src/targets/nv14/hal.h @@ -533,11 +533,6 @@ #define TRAINER_GPIO_AF LL_GPIO_AF_2 #define TRAINER_TIMER_FREQ (PERI1_FREQUENCY * TIMER_MULT_APB1) -//BLUETOOTH -#define BLUETOOTH_ON_RCC_AHB1Periph RCC_AHB1Periph_GPIOI -#define BLUETOOTH_ON_GPIO GPIOI -#define BLUETOOTH_ON_GPIO_PIN GPIO_Pin_8 // PI.8 - //ROTARY emulation for trims as buttons #define ROTARY_ENCODER_NAVIGATION @@ -559,8 +554,8 @@ #define BT_EN_GPIO GPIOI #define BT_EN_GPIO_PIN GPIO_Pin_8 // PI.08 -#define BT_CONNECTED_GPIO GPIOJ -#define BT_CONNECTED_GPIO_PIN GPIO_Pin_1 // PJ.10 +#define BT_CONNECTED_GPIO GPIOJ +#define BT_CONNECTED_GPIO_PIN GPIO_Pin_1 // PJ.10 #define BT_CMD_MODE_GPIO GPIOH #define BT_CMD_MODE_GPIO_PIN GPIO_Pin_6 // PH.6 diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h index a9b342157..c819089bb 100644 --- a/radio/src/targets/pl18/hal.h +++ b/radio/src/targets/pl18/hal.h @@ -662,7 +662,6 @@ #define ROTARY_ENCODER_NAVIGATION //BLUETOOTH -#define BLUETOOTH_ON_RCC_AHB1Periph RCC_AHB1Periph_GPIOI #define BT_EN_GPIO GPIOI #define BT_EN_GPIO_PIN GPIO_Pin_8 // PI.8