From 171efefe8c28c3bc20515f23871ec53f0bcf0cca Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Sat, 9 Dec 2023 13:23:19 +1000 Subject: [PATCH] fix: Update for PL18 --- radio/src/targets/pl18/board.cpp | 3 +-- radio/src/targets/pl18/board.h | 3 --- radio/src/targets/pl18/hal.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/radio/src/targets/pl18/board.cpp b/radio/src/targets/pl18/board.cpp index 7c4cd43166b..7aa6e472d25 100644 --- a/radio/src/targets/pl18/board.cpp +++ b/radio/src/targets/pl18/board.cpp @@ -83,7 +83,6 @@ void delay_self(int count) ) #define RCC_AHB1PeriphOther (AUDIO_RCC_AHB1Periph |\ TELEMETRY_RCC_AHB1Periph |\ - TRAINER_RCC_AHB1Periph |\ HAPTIC_RCC_AHB1Periph |\ EXTMODULE_RCC_AHB1Periph \ ) @@ -123,7 +122,7 @@ void boardInit() pwrInit(); boardInitModulePorts(); - init_trainer(); + board_trainer_init(); battery_charge_init(); flysky_gimbal_init(); timersInit(); diff --git a/radio/src/targets/pl18/board.h b/radio/src/targets/pl18/board.h index 631f0b82d2d..44322bef4b2 100644 --- a/radio/src/targets/pl18/board.h +++ b/radio/src/targets/pl18/board.h @@ -239,9 +239,6 @@ void hapticOn(uint32_t pwmPercent); #define DEBUG_BAUDRATE 115200 #define LUA_DEFAULT_BAUDRATE 115200 -extern uint8_t currentTrainerMode; -void checkTrainerSettings(); - // Touch panel driver bool touchPanelEventOccured(); struct TouchState touchPanelRead(); diff --git a/radio/src/targets/pl18/hal.h b/radio/src/targets/pl18/hal.h index ce3f32c9623..6c3c6e4e24e 100644 --- a/radio/src/targets/pl18/hal.h +++ b/radio/src/targets/pl18/hal.h @@ -653,7 +653,6 @@ #define EXTMODULE_RX_INVERTED() EXTMODULE_RX_INVERT_GPIO->BSRRL = EXTMODULE_RX_INVERT_GPIO_PIN // Trainer Port -#define TRAINER_RCC_AHB1Periph (RCC_AHB1Periph_GPIOD) #define TRAINER_GPIO GPIOD #define TRAINER_IN_GPIO_PIN LL_GPIO_PIN_12 // PD.12