From 4f0610c551c2b26537183cca971265de82422585 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 1 May 2024 09:44:52 +1000 Subject: [PATCH] chore: remove unused PWM_BACKLIGHT define (#4945) Most of the code was removed between OTX 2.2 and 2.3 --- radio/src/gui/128x64/radio_setup.cpp | 18 ------------------ radio/src/gui/common/stdlcd/features.h | 6 ------ radio/src/opentx.cpp | 5 ----- radio/src/translations.cpp | 2 +- radio/src/translations.h | 2 +- 5 files changed, 2 insertions(+), 31 deletions(-) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index c5a85d2fd..7ad925d16 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -86,8 +86,6 @@ enum { CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_MODE) CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_DELAY) CASE_BACKLIGHT(ITEM_RADIO_SETUP_BRIGHTNESS) - CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_OFF) - CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON) CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP) CASE_CONTRAST(ITEM_RADIO_SETUP_CONTRAST) CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) @@ -186,8 +184,6 @@ void menuRadioSetup(event_t event) CASE_BACKLIGHT(0) CASE_BACKLIGHT(0) CASE_BACKLIGHT(0) - CASE_PWM_BACKLIGHT(0) - CASE_PWM_BACKLIGHT(0) CASE_BACKLIGHT(0) CASE_CONTRAST(0) CASE_SPLASH_PARAM(0) @@ -567,20 +563,6 @@ void menuRadioSetup(event_t event) break; #endif -#if defined(PWM_BACKLIGHT) - case ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_OFF: - lcdDrawText(INDENT_WIDTH, y, STR_BLOFFBRIGHTNESS); - lcdDrawNumber(LCD_W-2, y, g_eeGeneral.blOffBright, attr|RIGHT); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.blOffBright, 0, 15); - break; - - case ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON: - lcdDrawText(INDENT_WIDTH, y, STR_BLONBRIGHTNESS); - lcdDrawNumber(LCD_W-2, y, 15-g_eeGeneral.blOnBright, attr|RIGHT); - if (attr) g_eeGeneral.blOnBright = 15 - checkIncDecGen(event, 15-g_eeGeneral.blOnBright, 0, 15); - break; -#endif - case ITEM_RADIO_SETUP_DISABLE_SPLASH: { lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); diff --git a/radio/src/gui/common/stdlcd/features.h b/radio/src/gui/common/stdlcd/features.h index 13691dbae..959099398 100644 --- a/radio/src/gui/common/stdlcd/features.h +++ b/radio/src/gui/common/stdlcd/features.h @@ -65,12 +65,6 @@ #define CASE_AUDIO(x) #endif -#if defined(PWM_BACKLIGHT) - #define CASE_PWM_BACKLIGHT(x) x, -#else - #define CASE_PWM_BACKLIGHT(x) -#endif - #if defined(GPS) #define CASE_GPS(x) x, #else diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index b83245970..ebe4c2c37 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -208,11 +208,6 @@ void per10ms() telemetryInterrupt10ms(); // These moved here from evalFlightModeMixes() to improve beep trigger reliability. -#if defined(PWM_BACKLIGHT) - if ((g_tmr10ms&0x03) == 0x00) - backlightFade(); // increment or decrement brightness until target brightness is reached -#endif - #if !defined(AUDIO) if (mixWarning & 1) if(((g_tmr10ms&0xFF)== 0)) AUDIO_MIX_WARNING(1); if (mixWarning & 2) if(((g_tmr10ms&0xFF)== 64) || ((g_tmr10ms&0xFF)== 72)) AUDIO_MIX_WARNING(2); diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 9e80bda93..22213812f 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -834,7 +834,7 @@ const char STR_IMU_OFFSET[] = TR_IMU_OFFSET; const char STR_IMU_MAX[] = TR_IMU_MAX; #endif -#if defined(PWM_BACKLIGHT) || defined(COLORLCD) +#if defined(COLORLCD) const char STR_BLONBRIGHTNESS[] = TR_BLONBRIGHTNESS; const char STR_BLOFFBRIGHTNESS[] = TR_BLOFFBRIGHTNESS; const char STR_KEYS_BACKLIGHT[] = TR_KEYS_BACKLIGHT; diff --git a/radio/src/translations.h b/radio/src/translations.h index bd3cdc18a..49e0997fd 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -418,7 +418,7 @@ extern const char STR_GHOST_MENU_LABEL[]; extern const char STR_STATUS[]; extern const char STR_BLDELAY[]; -#if defined(PWM_BACKLIGHT) || defined(COLORLCD) +#if defined(COLORLCD) extern const char STR_BLONBRIGHTNESS[]; extern const char STR_BLOFFBRIGHTNESS[]; extern const char STR_KEYS_BACKLIGHT[];