chore(firmware): cleanup legacy code and '#define' entries (#6735)

This commit is contained in:
philmoz
2025-10-30 16:31:41 +10:00
committed by GitHub
parent 4101d3fe0b
commit 2faf1278ca
52 changed files with 57 additions and 333 deletions
+1 -15
View File
@@ -51,7 +51,6 @@ enum {
CASE_RTCLOCK(ITEM_RADIO_SETUP_TIME)
ITEM_RADIO_SETUP_SOUND_LABEL,
CASE_AUDIO(ITEM_RADIO_SETUP_BEEP_MODE)
CASE_BUZZER(ITEM_RADIO_SETUP_BUZZER_MODE)
ITEM_RADIO_SETUP_SPEAKER_VOLUME,
ITEM_RADIO_SETUP_BEEP_VOLUME,
ITEM_RADIO_SETUP_BEEP_LENGTH,
@@ -178,7 +177,6 @@ void menuRadioSetup(event_t event)
// Sound
0,
CASE_AUDIO(SOUND_ROW(0))
CASE_BUZZER(SOUND_ROW(0))
SOUND_ROW(0),
SOUND_ROW(0),
SOUND_ROW(0),
@@ -343,21 +341,10 @@ void menuRadioSetup(event_t event)
#if defined(AUDIO)
case ITEM_RADIO_SETUP_BEEP_MODE:
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#if defined(BUZZER) // AUDIO + BUZZER
case ITEM_RADIO_SETUP_BUZZER_MODE:
g_eeGeneral.buzzerMode = editChoice(LCD_W-2, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#endif
#elif defined(BUZZER) // BUZZER only
case ITEM_RADIO_SETUP_BUZZER_MODE:
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#endif
#if defined(VOICE)
case ITEM_RADIO_SETUP_SPEAKER_VOLUME:
{
lcdDrawTextIndented(y, STR_VOLUME);
@@ -371,7 +358,6 @@ void menuRadioSetup(event_t event)
}
break;
}
#endif
case ITEM_RADIO_SETUP_BEEP_VOLUME:
g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME);
+1 -1
View File
@@ -364,7 +364,7 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_BEEP_MODE:
g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH);
g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_GENERAL_VOLUME:
+1 -1
View File
@@ -210,4 +210,4 @@ set(SRC ${SRC}
${RADIO_SRC_DIR}/thirdparty/lz4/lz4.c
)
add_definitions(-DLIBOPENUI)
add_definitions(-DCOLORLCD)
+1 -1
View File
@@ -191,7 +191,7 @@ class DateTimeWindow : public Window
static SetupLineDef soundPageSetupLines[] = {
{
// Beeps mode
STR_SPEAKER,
STR_MODE,
[](Window* parent, coord_t x, coord_t y) {
new Choice(parent, {x, y, 0, 0}, STR_VBEEPMODE, -2, 1,
GET_SET_DEFAULT(g_eeGeneral.beepMode));
@@ -53,12 +53,6 @@
#define CASE_RTCLOCK(x)
#endif
#if defined(BUZZER)
#define CASE_BUZZER(x) x,
#else
#define CASE_BUZZER(x)
#endif
#if defined(AUDIO)
#define CASE_AUDIO(x) x,
#else
+1 -1
View File
@@ -596,7 +596,7 @@ bool isSwitch2POSWarningStateAvailable(int state)
bool isThrottleSourceAvailable(int src)
{
#if !defined(LIBOPENUI)
#if !defined(COLORLCD)
src = throttleSource2Source(src);
#endif
return isSourceAvailable(src) &&
+2 -2
View File
@@ -37,7 +37,7 @@
#define CASE_ROTARY_ENCODER(x)
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
typedef std::function<bool(int)> IsValueAvailable;
#else
typedef bool (*IsValueAvailable)(int);
@@ -110,7 +110,7 @@ bool confirmModelChange();
bool isSwitch2POSWarningStateAvailable(int state);
#endif
#if defined(LIBOPENUI)
#if defined(COLORLCD)
#define IS_INSTANT_TRIM_ALLOWED() true
#elif defined(GUI)
#define IS_INSTANT_TRIM_ALLOWED() (IS_MAIN_VIEW_DISPLAYED() || IS_TELEMETRY_VIEW_DISPLAYED() || IS_OTHER_VIEW_DISPLAYED())