feat: simple global control for backlight/brightness and volume (#6684)

This commit is contained in:
philmoz
2026-01-04 17:56:50 +10:00
committed by GitHub
parent 586a567b0b
commit e80406b274
71 changed files with 812 additions and 374 deletions
+51 -17
View File
@@ -49,15 +49,17 @@ int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const c
enum {
CASE_RTCLOCK(ITEM_RADIO_SETUP_DATE)
CASE_RTCLOCK(ITEM_RADIO_SETUP_TIME)
ITEM_RADIO_SETUP_SOUND_LABEL,
CASE_AUDIO(ITEM_RADIO_SETUP_SOUND_LABEL)
CASE_AUDIO(ITEM_RADIO_SETUP_BEEP_MODE)
ITEM_RADIO_SETUP_SPEAKER_VOLUME,
ITEM_RADIO_SETUP_BEEP_VOLUME,
ITEM_RADIO_SETUP_BEEP_LENGTH,
CASE_AUDIO(ITEM_RADIO_SETUP_SPEAKER_VOLUME)
CASE_AUDIO(ITEM_RADIO_SETUP_BEEP_VOLUME)
CASE_AUDIO(ITEM_RADIO_SETUP_BEEP_LENGTH)
CASE_AUDIO(ITEM_RADIO_SETUP_SPEAKER_PITCH)
ITEM_RADIO_SETUP_WAV_VOLUME,
ITEM_RADIO_SETUP_BACKGROUND_VOLUME,
ITEM_RADIO_SETUP_START_SOUND,
CASE_AUDIO(ITEM_RADIO_SETUP_WAV_VOLUME)
CASE_AUDIO(ITEM_RADIO_SETUP_BACKGROUND_VOLUME)
CASE_AUDIO(ITEM_RADIO_SETUP_VOLUME_SOURCE)
CASE_AUDIO(ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE)
CASE_AUDIO(ITEM_RADIO_SETUP_START_SOUND)
CASE_VARIO(ITEM_RADIO_SETUP_VARIO_LABEL)
CASE_VARIO(ITEM_RADIO_SETUP_VARIO_VOLUME)
CASE_VARIO(ITEM_RADIO_SETUP_VARIO_PITCH)
@@ -82,6 +84,8 @@ enum {
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_DELAY)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BRIGHTNESS)
CASE_CONTRAST(ITEM_RADIO_SETUP_CONTRAST)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_FLASH_BEEP)
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED)
@@ -130,6 +134,8 @@ PACK(struct ExpandState {
static struct ExpandState expandState;
static uint8_t SOUND_ROW(uint8_t value) { return expandState.sound ? value : HIDDEN_ROW; }
static uint8_t SOUND_WARNING_ROW(uint8_t value) { return expandState.sound && isFunctionActive(FUNCTION_VOLUME) ? value : HIDDEN_ROW; }
static uint8_t BACKLIGHT_WARNING_ROW(uint8_t value) { return isFunctionActive(FUNCTION_BACKLIGHT) ? value : HIDDEN_ROW; }
static uint8_t ALARMS_ROW(uint8_t value) { return expandState.alarms ? value : HIDDEN_ROW; }
@@ -177,13 +183,15 @@ void menuRadioSetup(event_t event)
// Sound
0,
CASE_AUDIO(SOUND_ROW(0))
SOUND_ROW(0),
SOUND_ROW(0),
SOUND_ROW(0),
CASE_AUDIO(SOUND_ROW(0))
SOUND_ROW(0),
SOUND_ROW(0),
SOUND_ROW(0),
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_ROW(0))
CASE_AUDIO(SOUND_WARNING_ROW(LABEL(0)))
CASE_AUDIO(SOUND_ROW(0))
// Vario
CASE_VARIO(LABEL(VARIO))
CASE_VARIO(0)
@@ -214,6 +222,8 @@ void menuRadioSetup(event_t event)
CASE_BACKLIGHT(0)
CASE_CONTRAST(0)
CASE_BACKLIGHT(0)
CASE_BACKLIGHT(BACKLIGHT_WARNING_ROW(LABEL(0)))
CASE_BACKLIGHT(0)
CASE_SPLASH_PARAM(0)
CASE_PWR_BUTTON_PRESS(0)
CASE_PWR_BUTTON_PRESS(0)
@@ -335,15 +345,14 @@ void menuRadioSetup(event_t event)
break;
#endif
#if defined(AUDIO)
case ITEM_RADIO_SETUP_SOUND_LABEL:
expandState.sound = expandableSection(y, STR_SOUND_LABEL, expandState.sound, attr, event);
break;
#if defined(AUDIO)
case ITEM_RADIO_SETUP_BEEP_MODE:
g_eeGeneral.beepMode = editChoice(LCD_W-2, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr|RIGHT, event, INDENT_WIDTH);
break;
#endif
case ITEM_RADIO_SETUP_SPEAKER_VOLUME:
{
@@ -375,7 +384,6 @@ void menuRadioSetup(event_t event)
g_eeGeneral.beepLength = slider_5pos(y, g_eeGeneral.beepLength, event, attr, STR_BEEP_LENGTH);
break;
#if defined(AUDIO)
case ITEM_RADIO_SETUP_SPEAKER_PITCH:
{
lcdDrawTextIndented(y, STR_BEEP_PITCH);
@@ -388,11 +396,24 @@ void menuRadioSetup(event_t event)
}
}
break;
#endif
case ITEM_RADIO_SETUP_VOLUME_SOURCE:
lcdDrawTextIndented(y, STR_CONTROL);
drawSource(LCD_W-2, y, g_eeGeneral.volumeSrc, STREXPANDED|RIGHT|attr);
if (attr)
g_eeGeneral.volumeSrc = checkIncDec(event, g_eeGeneral.volumeSrc,
MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
isSourceAvailableForBacklightOrVolume);
break;
case ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE:
lcdDrawText(LCD_W, y, STR_SF_OVERRIDDEN, RIGHT);
break;
case ITEM_RADIO_SETUP_START_SOUND:
g_eeGeneral.dontPlayHello = !editCheckBox(!g_eeGeneral.dontPlayHello, LCD_W-9, y, STR_PLAY_HELLO, attr, event, INDENT_WIDTH) ;
break;
#endif
#if defined(VARIO)
case ITEM_RADIO_SETUP_VARIO_LABEL:
@@ -565,6 +586,19 @@ void menuRadioSetup(event_t event)
#endif
}
break;
case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE:
lcdDrawTextIndented(y, STR_CONTROL);
drawSource(LCD_W-2, y, g_eeGeneral.backlightSrc, STREXPANDED|RIGHT|attr);
if (attr)
g_eeGeneral.backlightSrc = checkIncDec(event, g_eeGeneral.backlightSrc,
MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
isSourceAvailableForBacklightOrVolume);
break;
case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE:
lcdDrawText(LCD_W, y, STR_SF_OVERRIDDEN, RIGHT);
break;
#endif
#if !defined(OLED_SCREEN)
+36
View File
@@ -56,6 +56,8 @@ enum MenuRadioSetupItems {
ITEM_RADIO_SETUP_SPEAKER_PITCH,
ITEM_RADIO_SETUP_WAV_VOLUME,
ITEM_RADIO_SETUP_BACKGROUND_VOLUME,
ITEM_RADIO_SETUP_VOLUME_SOURCE,
ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE,
ITEM_RADIO_SETUP_START_SOUND,
CASE_VARIO(ITEM_RADIO_SETUP_VARIO_LABEL)
CASE_VARIO(ITEM_RADIO_SETUP_VARIO_VOLUME)
@@ -79,6 +81,8 @@ enum MenuRadioSetupItems {
ITEM_RADIO_SETUP_BRIGHTNESS,
ITEM_RADIO_SETUP_CONTRAST,
CASE_PCBX9E_PCBX9DP(ITEM_RADIO_SETUP_BACKLIGHT_COLOR)
ITEM_RADIO_SETUP_BACKLIGHT_SOURCE,
ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE,
ITEM_RADIO_SETUP_FLASH_BEEP,
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
CASE_PWR_BUTTON_PRESS(ITEM_RADIO_SETUP_PWR_ON_SPEED)
@@ -129,6 +133,8 @@ PACK(struct ExpandState {
static struct ExpandState expandState;
static uint8_t SOUND_ROW(uint8_t value) { return expandState.sound ? value : HIDDEN_ROW; }
static uint8_t SOUND_WARNING_ROW(uint8_t value) { return expandState.sound && isFunctionActive(FUNCTION_VOLUME) ? value : HIDDEN_ROW; }
static uint8_t BACKLIGHT_WARNING_ROW(uint8_t value) { return isFunctionActive(FUNCTION_BACKLIGHT) ? value : HIDDEN_ROW; }
static uint8_t ALARMS_ROW(uint8_t value) { return expandState.alarms ? value : HIDDEN_ROW; }
@@ -186,6 +192,8 @@ void menuRadioSetup(event_t event)
SOUND_ROW(0), // speaker piutch
SOUND_ROW(0), // wav volume
SOUND_ROW(0), // background volume
SOUND_ROW(0), // volume control
SOUND_WARNING_ROW(LABEL(0)), // volume control override warning
SOUND_ROW(0), // startup sound
// Vario
CASE_VARIO(LABEL(VARIO))
@@ -213,6 +221,8 @@ void menuRadioSetup(event_t event)
0, // brightness
0, // contrast
CASE_PCBX9E_PCBX9DP(0) // backlight color
0, // backlight control
BACKLIGHT_WARNING_ROW(LABEL(0)), // backlight control override warning
0, // flash beep
CASE_SPLASH_PARAM(0) // disable splash
CASE_PWR_BUTTON_PRESS(0) // pwr on speed
@@ -407,6 +417,19 @@ void menuRadioSetup(event_t event)
}
break;
case ITEM_RADIO_SETUP_VOLUME_SOURCE:
lcdDrawTextIndented(y, STR_CONTROL);
drawSource(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.volumeSrc, STREXPANDED|attr);
if (attr)
g_eeGeneral.volumeSrc = checkIncDec(event, g_eeGeneral.volumeSrc,
MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
isSourceAvailableForBacklightOrVolume);
break;
case ITEM_RADIO_SETUP_VOLUME_SOURCE_OVRRIDE:
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, STR_SF_OVERRIDDEN, RIGHT);
break;
case ITEM_RADIO_SETUP_START_SOUND:
g_eeGeneral.dontPlayHello = !editCheckBox(!g_eeGeneral.dontPlayHello, RADIO_SETUP_2ND_COLUMN, y, STR_PLAY_HELLO, attr, event, INDENT_WIDTH) ;
break;
@@ -562,6 +585,19 @@ void menuRadioSetup(event_t event)
break;
#endif
case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE:
lcdDrawTextIndented(y, STR_CONTROL);
drawSource(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightSrc, STREXPANDED|attr);
if (attr)
g_eeGeneral.backlightSrc = checkIncDec(event, g_eeGeneral.backlightSrc,
MIXSRC_NONE, MIXSRC_LAST_SWITCH, EE_MODEL|INCDEC_SOURCE|INCDEC_SOURCE_INVERT|NO_INCDEC_MARKS,
isSourceAvailableForBacklightOrVolume);
break;
case ITEM_RADIO_SETUP_BACKLIGHT_SOURCE_OVERRIDE:
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, STR_SF_OVERRIDDEN, RIGHT);
break;
case ITEM_RADIO_SETUP_DISABLE_SPLASH:
lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN);
if (SPLASH_NEEDED()) {
+1 -1
View File
@@ -87,7 +87,7 @@ class SubPage : public Page
Window* setupLine(const char* title, std::function<void(Window*, coord_t, coord_t)> createEdit, coord_t lblYOffset = 0);
static constexpr coord_t EDT_X = LCD_W * 9 / 20;
static LAYOUT_SIZE(EDT_X, LCD_W * 9 / 20, LCD_W * 8 / 20)
protected:
coord_t y = 0;
@@ -31,6 +31,7 @@
#include "edgetx.h"
#include "page.h"
#include "storage/modelslist.h"
#include "sourcechoice.h"
#include "tasks/mixer_task.h"
#include "slider.h"
#include "key_shortcuts.h"
@@ -189,6 +190,26 @@ class DateTimeWindow : public Window
}
};
class ControlTextOverride : public StaticText
{
public:
ControlTextOverride(Window* parent, coord_t x, coord_t y, FunctionsActive func) :
StaticText(parent, {x + XO, y + PAD_MEDIUM, 0, 0}, STR_SF_OVERRIDDEN, COLOR_THEME_WARNING_INDEX, FONT_SZ), func(func)
{
}
void checkEvents() override
{
show(isFunctionActive(func));
}
static LAYOUT_SIZE(FONT_SZ, FONT(STD), FONT(XS))
static LAYOUT_ORIENTATION(XO, PAD_LARGE * 12, PAD_LARGE * 8)
protected:
FunctionsActive func;
};
#if defined(AUDIO)
static SetupLineDef soundPageSetupLines[] = {
{
@@ -255,6 +276,16 @@ static SetupLineDef soundPageSetupLines[] = {
GET_SET_DEFAULT(g_eeGeneral.backgroundVolume)))->setPos(x, y);
}
},
{
// Volume source
STR_DEF(STR_CONTROL),
[](Window* parent, coord_t x, coord_t y) {
auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
GET_SET_DEFAULT(g_eeGeneral.volumeSrc), true);
choice->setAvailableHandler(isSourceAvailableForBacklightOrVolume);
new ControlTextOverride(parent, x, y, FUNCTION_VOLUME);
}
},
#if defined(KCX_BTAUDIO)
{
STR_DEF(STR_BTAUDIO),
@@ -496,6 +527,14 @@ class BacklightPage : public SubPage
});
#endif
// Backlight/Brightness source
setupLine(STR_CONTROL, [=](Window* parent, coord_t x, coord_t y) {
auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
GET_SET_DEFAULT(g_eeGeneral.backlightSrc), true);
choice->setAvailableHandler(isSourceAvailableForBacklightOrVolume);
new ControlTextOverride(parent, x, y, FUNCTION_BACKLIGHT);
});
// Flash beep
setupLine(STR_ALARM, [=](Window* parent, coord_t x, coord_t y) {
new ToggleSwitch(parent, {x, y, 0, 0}, GET_SET_DEFAULT(g_eeGeneral.alarmsFlash));
+5
View File
@@ -308,6 +308,11 @@ bool isSourceAvailable(int source)
);
}
bool isSourceAvailableForBacklightOrVolume(int source)
{
return checkSourceAvailable(source, SRC_SWITCH | SRC_POT | SRC_NONE);
}
bool isLogicalSwitchAvailable(int index)
{
LogicalSwitchData * lsw = lswAddress(index);
+1
View File
@@ -60,6 +60,7 @@ bool isInputAvailable(int input);
bool isThrottleSourceAvailable(int source);
bool isLogicalSwitchAvailable(int index);
bool isAssignableFunctionAvailable(int function);
bool isSourceAvailableForBacklightOrVolume(int source);
bool isSourceAvailable(int source);
int timersSetupCount();
bool isTimerSourceAvailable(int source);
+28 -17
View File
@@ -93,6 +93,31 @@ void addPopupItem(int i_min, int i_max, int rangeMin, int rangeMax, IsValueAvail
}
}
struct popupCheckDef {
MixSources first;
MixSources last;
const char* title;
};
static const popupCheckDef popupChecks[] = {
{ MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, STR_MENU_INPUTS },
#if defined(LUA_MODEL_SCRIPTS)
{ MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, STR_MENU_LUA },
#endif
{ MIXSRC_FIRST_STICK, MIXSRC_LAST_STICK, STR_MENU_STICKS },
{ MIXSRC_FIRST_POT, MIXSRC_LAST_POT, STR_MENU_POTS },
{ MIXSRC_MIN, MIXSRC_MIN, STR_MENU_MIN },
{ MIXSRC_MAX, MIXSRC_MAX, STR_MENU_MAX },
#if defined(HELI)
{ MIXSRC_FIRST_HELI, MIXSRC_LAST_HELI, STR_MENU_HELI },
#endif
{ MIXSRC_FIRST_TRIM, MIXSRC_LAST_TRIM, STR_MENU_TRIMS },
{ MIXSRC_FIRST_SWITCH, MIXSRC_LAST_SWITCH, STR_MENU_SWITCHES },
{ MIXSRC_FIRST_TRAINER, MIXSRC_LAST_TRAINER, STR_MENU_TRAINER },
{ MIXSRC_FIRST_CH, MIXSRC_LAST_CH, STR_MENU_CHANNELS },
{ MIXSRC_FIRST_GVAR, MIXSRC_LAST_GVAR, STR_MENU_GVARS },
};
inline int showPopupMenus(event_t event, int newval, int i_min, int i_max,
unsigned int i_flags, IsValueAvailable isValueAvailable,
bool& isSource)
@@ -105,23 +130,9 @@ inline int showPopupMenus(event_t event, int newval, int i_min, int i_max,
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
}
addPopupItem(i_min, i_max, MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isValueAvailable, STR_MENU_INPUTS);
#if defined(LUA_MODEL_SCRIPTS)
addPopupItem(i_min, i_max, MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isValueAvailable, STR_MENU_LUA);
#endif
if (i_min <= MIXSRC_FIRST_STICK && i_max >= MIXSRC_FIRST_STICK) POPUP_MENU_ADD_ITEM(STR_MENU_STICKS);
if (i_min <= MIXSRC_FIRST_POT && i_max >= MIXSRC_FIRST_POT) POPUP_MENU_ADD_ITEM(STR_MENU_POTS);
if (i_min <= MIXSRC_MIN && i_max >= MIXSRC_MIN) POPUP_MENU_ADD_ITEM(STR_MENU_MIN);
if (i_min <= MIXSRC_MAX && i_max >= MIXSRC_MAX) POPUP_MENU_ADD_ITEM(STR_MENU_MAX);
#if defined(HELI)
if (modelHeliEnabled())
addPopupItem(i_min, i_max, MIXSRC_FIRST_HELI, MIXSRC_LAST_HELI, isValueAvailable, STR_MENU_HELI);
#endif
if (i_min <= MIXSRC_FIRST_TRIM && i_max >= MIXSRC_FIRST_TRIM) POPUP_MENU_ADD_ITEM(STR_MENU_TRIMS);
if (i_min <= MIXSRC_FIRST_SWITCH && i_max >= MIXSRC_FIRST_SWITCH) POPUP_MENU_ADD_ITEM(STR_MENU_SWITCHES);
addPopupItem(i_min, i_max, MIXSRC_FIRST_TRAINER, MIXSRC_LAST_TRAINER, isValueAvailable, STR_MENU_TRAINER);
if (i_min <= MIXSRC_FIRST_CH && i_max >= MIXSRC_FIRST_CH) POPUP_MENU_ADD_ITEM(STR_MENU_CHANNELS);
addPopupItem(i_min, i_max, MIXSRC_FIRST_GVAR, MIXSRC_LAST_GVAR, isValueAvailable, STR_MENU_GVARS);
for (size_t i = 0; i < DIM(popupChecks); i += 1) {
addPopupItem(i_min, i_max, popupChecks[i].first, popupChecks[i].last, isValueAvailable, popupChecks[i].title);
}
if (modelTelemetryEnabled() && i_min <= MIXSRC_FIRST_TELEM && i_max >= MIXSRC_FIRST_TELEM) {
for (int i = 0; i < MAX_TELEMETRY_SENSORS; i++) {