diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 42e175976..546585f04 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -303,23 +303,6 @@ void watchdogSetTimeout(uint32_t timeout) { watchdogTimeout = timeout; } - -#if 0 -// TODO remove definitely? -void opentxBootloader() -{ - BACKLIGHT_ON(); - - lcd_clear(); - lcd_putcAtt( 48, 24, 'U', DBLSIZE ) ; - lcd_putcAtt( 60, 24, 'S', DBLSIZE ) ; - lcd_putcAtt( 72, 24, 'B', DBLSIZE ) ; - lcdRefresh() ; - - usbBootloader(); -} -#endif - #endif void per10ms() @@ -5678,27 +5661,6 @@ int main(void) opentxInit(mcusr); #endif -#if 0 - // TODO remove definitely? - if (BOOTLOADER_REQUEST()) { - pwrOff(); // Only turn power off if necessary - -#if defined(HAPTIC) - hapticOff(); -#endif - - g_eeGeneral.optrexDisplay = 1; - lcd_clear(); - lcdRefresh(); - - g_eeGeneral.optrexDisplay = 0; - g_eeGeneral.backlightBright = 0; - g_eeGeneral.contrast = 25; - - opentxBootloader(); - } -#endif - #if defined(CPUARM) CoInitOS(); diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h index 386b73905..3d78a920c 100644 --- a/radio/src/targets/sky9x/board_sky9x.h +++ b/radio/src/targets/sky9x/board_sky9x.h @@ -165,12 +165,6 @@ extern uint32_t Current_used; extern uint16_t sessionTimer; #endif -#if defined(REVC) -#define BOOTLOADER_REQUEST() (usbPlugged()) -#else -#define BOOTLOADER_REQUEST() (pwrCheck() == e_power_usb) -#endif - #define SLAVE_MODE() (pwrCheck() == e_power_trainer) #define JACK_PPM_OUT() PIOC->PIO_PDR = PIO_PC22 #define JACK_PPM_IN() PIOC->PIO_PER = PIO_PC22 @@ -204,7 +198,6 @@ void disable_ssc(); #define init_dsm2(port) init_main_ppm(5000, 0); init_ssc() #define disable_dsm2(port) disable_ssc() - // SD driver #if defined(SIMU) #define sdInit() @@ -291,4 +284,8 @@ void rotencEnd(); // Debug driver void debugPutc(const char c); +// Telemetry driver +void UART2_Configure(uint32_t baudrate, uint32_t masterClock); +void startPdcUsartReceive(); + #endif diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index 5fd7d7bd6..3f071e8c3 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -224,8 +224,6 @@ void turnBacklightOff(void); #endif // USB driver -#define BOOTLOADER_REQUEST() (0) -#define usbBootloader() int usbPlugged(void); void usbInit(void); void usbStart(void);