piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(bw): tidy up Radio Setup menu (#4939)

Browse Source 
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
philmoz
2024-05-30 15:59:15 +10:00
committed by GitHub
co-authored by Peter Feerick
parent e1b1b88f01
commit 9bdd5664a0
58 changed files with 1282 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/radio_setup.cpp
+38 -52
View File
@@ -36,10 +36,10 @@ const unsigned char sticks[] = {
#define RADIO_SETUP_DATE_COLUMN RADIO_SETUP_2ND_COLUMN + 4*FWNUM
#define RADIO_SETUP_TIME_COLUMN RADIO_SETUP_2ND_COLUMN + 2*FWNUM
#define SLIDER_5POS(y, value, event, attr) { \
int8_t tmp = value; \
drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \
value = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, nullptr, tmp, -2, +2, attr, event); \
int8_t slider_5pos(coord_t y, int8_t value, event_t event, uint8_t attr, const char* title)
{
drawSlider(RADIO_SETUP_2ND_COLUMN, y, 2+value, 4, attr); \
return editChoice(RADIO_SETUP_2ND_COLUMN, y, title, nullptr, value, -2, +2, attr, event, INDENT_WIDTH);
}
enum MenuRadioSetupItems {
@@ -64,7 +64,6 @@ enum MenuRadioSetupItems {
CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_MODE)
CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_LENGTH)
CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_STRENGTH)
ITEM_RADIO_SETUP_CONTRAST,
ITEM_RADIO_SETUP_ALARMS_LABEL,
ITEM_RADIO_SETUP_BATTERY_WARNING,
ITEM_RADIO_SETUP_INACTIVITY_ALARM,
@@ -76,6 +75,7 @@ enum MenuRadioSetupItems {
ITEM_RADIO_SETUP_BACKLIGHT_MODE,
ITEM_RADIO_SETUP_BACKLIGHT_DELAY,
ITEM_RADIO_SETUP_BRIGHTNESS,
ITEM_RADIO_SETUP_CONTRAST,
CASE_PCBX9E_PCBX9DP(ITEM_RADIO_SETUP_BACKLIGHT_COLOR)
ITEM_RADIO_SETUP_FLASH_BEEP,
CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH)
@@ -176,7 +176,6 @@ void menuRadioSetup(event_t event)
CASE_HAPTIC(0) // haptic mode
CASE_HAPTIC(0) // haptic length
CASE_HAPTIC(0) // haptic strength
0, // contrast
LABEL(ALARMS),
0, // battery warning
0, // inactivity warning
@@ -188,6 +187,7 @@ void menuRadioSetup(event_t event)
0, // backlight mode
0, // backlight delay
0, // brightness
0, // contrast
CASE_PCBX9E_PCBX9DP(0) // backlight color
0, // flash beep
CASE_SPLASH_PARAM(0) // disable splash
@@ -334,12 +334,12 @@ 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);
g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_GENERAL_VOLUME:
{
lcdDrawText(INDENT_WIDTH, y, STR_VOLUME);
lcdDrawTextIndented(y, STR_VOLUME);
uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF;
drawSlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr);
if (attr) {
@@ -352,27 +352,23 @@ void menuRadioSetup(event_t event)
}
case ITEM_RADIO_SETUP_BEEP_VOLUME:
lcdDrawTextAlignedLeft(y, STR_BEEP_VOLUME);
SLIDER_5POS(y, g_eeGeneral.beepVolume, event, attr);
g_eeGeneral.beepVolume = slider_5pos(y, g_eeGeneral.beepVolume, event, attr, STR_BEEP_VOLUME);
break;
case ITEM_RADIO_SETUP_WAV_VOLUME:
lcdDrawTextAlignedLeft(y, STR_WAV_VOLUME);
SLIDER_5POS(y, g_eeGeneral.wavVolume, event, attr);
g_eeGeneral.wavVolume = slider_5pos(y, g_eeGeneral.wavVolume, event, attr, STR_WAV_VOLUME);
break;
case ITEM_RADIO_SETUP_BACKGROUND_VOLUME:
lcdDrawTextAlignedLeft(y, STR_BG_VOLUME);
SLIDER_5POS(y, g_eeGeneral.backgroundVolume, event, attr);
g_eeGeneral.backgroundVolume = slider_5pos(y, g_eeGeneral.backgroundVolume, event, attr, STR_BG_VOLUME);
break;
case ITEM_RADIO_SETUP_BEEP_LENGTH:
lcdDrawText(INDENT_WIDTH, y, STR_BEEP_LENGTH);
SLIDER_5POS(y, g_eeGeneral.beepLength, event, attr);
g_eeGeneral.beepLength = slider_5pos(y, g_eeGeneral.beepLength, event, attr, STR_BEEP_LENGTH);
break;
case ITEM_RADIO_SETUP_SPEAKER_PITCH:
lcdDrawText(INDENT_WIDTH, y, STR_BEEP_PITCH);
lcdDrawTextIndented(y, STR_BEEP_PITCH);
lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT);
lcdDrawText(lcdLastRightPos, y, "Hz", attr);
@@ -387,26 +383,25 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_VARIO_VOLUME:
lcdDrawText(INDENT_WIDTH, y, STR_VOLUME);
SLIDER_5POS(y, g_eeGeneral.varioVolume, event, attr);
g_eeGeneral.varioVolume = slider_5pos(y, g_eeGeneral.varioVolume, event, attr, STR_VOLUME);
break;
case ITEM_RADIO_SETUP_VARIO_PITCH:
lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_ZERO);
lcdDrawTextIndented(y, STR_PITCH_AT_ZERO);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT);
lcdDrawText(lcdLastRightPos, y, "Hz", attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40);
break;
case ITEM_RADIO_SETUP_VARIO_RANGE:
lcdDrawText(INDENT_WIDTH, y, STR_PITCH_AT_MAX);
lcdDrawTextIndented(y, STR_PITCH_AT_MAX);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT);
lcdDrawText(lcdLastRightPos, y, "Hz", attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80);
break;
case ITEM_RADIO_SETUP_VARIO_REPEAT:
lcdDrawText(INDENT_WIDTH, y, STR_REPEAT_AT_ZERO);
lcdDrawTextIndented(y, STR_REPEAT_AT_ZERO);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
lcdDrawText(lcdLastRightPos, y, STR_MS, attr);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
@@ -419,23 +414,20 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_HAPTIC_MODE:
lcdDrawText(INDENT_WIDTH, y, STR_MODE);
g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event);
g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_HAPTIC_LENGTH:
lcdDrawText(INDENT_WIDTH, y, STR_LENGTH);
SLIDER_5POS(y, g_eeGeneral.hapticLength, event, attr);
g_eeGeneral.hapticLength = slider_5pos(y, g_eeGeneral.hapticLength, event, attr, STR_LENGTH);
break;
case ITEM_RADIO_SETUP_HAPTIC_STRENGTH:
lcdDrawText(INDENT_WIDTH, y, STR_STRENGTH);
SLIDER_5POS(y, g_eeGeneral.hapticStrength, event, attr);
g_eeGeneral.hapticStrength = slider_5pos(y, g_eeGeneral.hapticStrength, event, attr, STR_STRENGTH);
break;
#endif
case ITEM_RADIO_SETUP_CONTRAST:
lcdDrawTextAlignedLeft(y, STR_CONTRAST);
lcdDrawTextIndented(y, STR_CONTRAST);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT);
if (attr) {
CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, LCD_CONTRAST_MIN, LCD_CONTRAST_MAX);
@@ -448,32 +440,29 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_BATTERY_WARNING:
lcdDrawText(INDENT_WIDTH, y, STR_BATTERYWARNING);
lcdDrawTextIndented(y, STR_BATTERYWARNING);
putsVolts(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.vBatWarn, attr|LEFT);
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatWarn, 40, 120); // 4-12V
break;
case ITEM_RADIO_SETUP_MEMORY_WARNING:
{
lcdDrawText(INDENT_WIDTH, y, STR_MEMORYWARNING);
uint8_t b = 1 - g_eeGeneral.disableMemoryWarning;
g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event, INDENT_WIDTH);
break;
}
case ITEM_RADIO_SETUP_ALARM_WARNING:
{
lcdDrawText(INDENT_WIDTH, y, STR_ALARMWARNING);
uint8_t b = 1 - g_eeGeneral.disableAlarmWarning;
g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event, INDENT_WIDTH);
break;
}
case ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM:
{
lcdDrawText(INDENT_WIDTH, y, STR_RSSI_SHUTDOWN_ALARM);
uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm;
g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_RSSI_SHUTDOWN_ALARM, attr, event, INDENT_WIDTH);
break;
}
@@ -486,7 +475,7 @@ void menuRadioSetup(event_t event)
}
case ITEM_RADIO_SETUP_INACTIVITY_ALARM:
lcdDrawText(INDENT_WIDTH, y, STR_INACTIVITYALARM);
lcdDrawTextIndented(y, STR_INACTIVITYALARM);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 'm');
if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes
@@ -497,13 +486,12 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_BACKLIGHT_MODE:
lcdDrawText(INDENT_WIDTH, y, STR_MODE);
g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event);
g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_FLASH_BEEP:
lcdDrawText(INDENT_WIDTH, y, STR_ALARM);
g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event ) ;
lcdDrawTextIndented(y, STR_ALARM);
g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event, INDENT_WIDTH) ;
break;
#if defined(PXX2)
@@ -516,14 +504,14 @@ void menuRadioSetup(event_t event)
#endif
case ITEM_RADIO_SETUP_BACKLIGHT_DELAY:
lcdDrawText(INDENT_WIDTH, y, STR_DURATION);
lcdDrawTextIndented(y, STR_DURATION);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT);
lcdDrawChar(lcdLastRightPos, y, 's');
if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5);
break;
case ITEM_RADIO_SETUP_BRIGHTNESS:
lcdDrawText(INDENT_WIDTH, y, STR_BRIGHTNESS);
lcdDrawTextIndented(y, STR_BRIGHTNESS);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ;
if (attr) {
uint8_t b = 100 - g_eeGeneral.backlightBright;
@@ -534,7 +522,7 @@ void menuRadioSetup(event_t event)
#if defined(PCBX9DP) || defined(PCBX9E)
case ITEM_RADIO_SETUP_BACKLIGHT_COLOR:
lcdDrawText(INDENT_WIDTH, y, STR_BLCOLOR);
lcdDrawTextIndented(y, STR_BLCOLOR);
drawSlider(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.backlightColor, 20, attr);
if (attr) g_eeGeneral.backlightColor = checkIncDec(event, g_eeGeneral.backlightColor, 0, 20, EE_GENERAL | NO_INCDEC_MARKS);
break;
@@ -580,7 +568,7 @@ void menuRadioSetup(event_t event)
case ITEM_RADIO_SETUP_TIMEZONE:
{
lcdDrawText(INDENT_WIDTH, y, STR_TIMEZONE);
lcdDrawTextIndented(y, STR_TIMEZONE);
int tzIndex = timezoneIndex(g_eeGeneral.timezone, g_eeGeneral.timezoneMinutes);
lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, timezoneDisplay(tzIndex).c_str(), attr);
if (attr) {
@@ -594,13 +582,11 @@ void menuRadioSetup(event_t event)
break;
case ITEM_RADIO_SETUP_ADJUST_RTC:
lcdDrawText(INDENT_WIDTH, y, STR_ADJUST_RTC);
g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, STR_ADJUST_RTC, attr, event, INDENT_WIDTH);
break;
case ITEM_RADIO_SETUP_GPSFORMAT:
lcdDrawText(INDENT_WIDTH, y, STR_GPS_COORDS_FORMAT);
g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, nullptr, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event);
g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_GPS_COORDS_FORMAT, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event, INDENT_WIDTH);
break;
#endif
@@ -658,7 +644,7 @@ void menuRadioSetup(event_t event)
lcdDrawTextAlignedLeft(y, STR_DEF_CHAN_ORD); // RAET->AETR
{
for (uint8_t i = 0; i < adcGetMaxInputs(ADC_INPUT_MAIN); i++) {
putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, inputMappingChannelOrder(i), attr);
putsChnLetter(RADIO_SETUP_2ND_COLUMN + i*FW, y, inputMappingChannelOrder(i), attr);
}
if (attr) {
auto max_order = inputMappingGetMaxChannelOrder() - 1;
@@ -718,7 +704,7 @@ void menuRadioSetup(event_t event)
lcdDrawTextAlignedLeft(y, STR_ENABLED_FEATURES);
break;
case ITEM_VIEW_OPTIONS_RADIO_TAB:
lcdDrawText(INDENT_WIDTH, y, TR_RADIO_MENU_TABS);
lcdDrawTextIndented(y, TR_RADIO_MENU_TABS);
break;
case ITEM_VIEW_OPTIONS_GF:
g_eeGeneral.radioGFDisabled = viewOptCheckBox(y, STR_MENUSPECIALFUNCS, g_eeGeneral.radioGFDisabled, attr, event, g_model.radioGFDisabled);
@@ -727,7 +713,7 @@ void menuRadioSetup(event_t event)
g_eeGeneral.radioTrainerDisabled = viewOptCheckBox(y, STR_MENUTRAINER, g_eeGeneral.radioTrainerDisabled, attr, event, g_model.radioTrainerDisabled);
break;
case ITEM_VIEW_OPTIONS_MODEL_TAB:
lcdDrawText(INDENT_WIDTH, y, TR_MODEL_MENU_TABS);
lcdDrawTextIndented(y, TR_MODEL_MENU_TABS);
break;
#if defined(HELI)
case ITEM_VIEW_OPTIONS_HELI: