From 300430b8b283abd3216dd3a0c833bca2dac03b57 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 22 Jul 2019 16:10:56 +0200 Subject: [PATCH] Cosmetics --- radio/src/gui/128x64/radio_setup.cpp | 226 +++++++++++++-------------- radio/src/gui/212x64/radio_setup.cpp | 198 +++++++++++------------ 2 files changed, 212 insertions(+), 212 deletions(-) diff --git a/radio/src/gui/128x64/radio_setup.cpp b/radio/src/gui/128x64/radio_setup.cpp index 230761ffc..47f6b0146 100644 --- a/radio/src/gui/128x64/radio_setup.cpp +++ b/radio/src/gui/128x64/radio_setup.cpp @@ -46,64 +46,64 @@ const unsigned char sticks[] = { #define CASE_BATTGRAPH(x) #endif -enum MenuRadioSetupItems { - CASE_RTCLOCK(ITEM_SETUP_DATE) - CASE_RTCLOCK(ITEM_SETUP_TIME) - CASE_BATTGRAPH(ITEM_SETUP_BATT_RANGE) - ITEM_SETUP_SOUND_LABEL, - CASE_AUDIO(ITEM_SETUP_BEEP_MODE) - CASE_BUZZER(ITEM_SETUP_BUZZER_MODE) - ITEM_SETUP_SPEAKER_VOLUME, - ITEM_SETUP_BEEP_VOLUME, - ITEM_SETUP_BEEP_LENGTH, - CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) - ITEM_SETUP_WAV_VOLUME, - ITEM_SETUP_BACKGROUND_VOLUME, - CASE_VARIO(ITEM_SETUP_VARIO_LABEL) - CASE_VARIO(ITEM_SETUP_VARIO_VOLUME) - CASE_VARIO(ITEM_SETUP_VARIO_PITCH) - CASE_VARIO(ITEM_SETUP_VARIO_RANGE) - CASE_VARIO(ITEM_SETUP_VARIO_REPEAT) - CASE_HAPTIC(ITEM_SETUP_HAPTIC_LABEL) - CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE) - CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH) - CASE_HAPTIC(ITEM_SETUP_HAPTIC_STRENGTH) - CASE_GYRO(ITEM_SETUP_GYRO_LABEL) - CASE_GYRO(ITEM_SETUP_GYRO_MAX) - CASE_GYRO(ITEM_SETUP_GYRO_OFFSET) - ITEM_SETUP_CONTRAST, - ITEM_SETUP_ALARMS_LABEL, - ITEM_SETUP_BATTERY_WARNING, - CASE_CAPACITY(ITEM_SETUP_CAPACITY_WARNING) - ITEM_SETUP_INACTIVITY_ALARM, - ITEM_SETUP_MEMORY_WARNING, - ITEM_SETUP_ALARM_WARNING, - ITEM_SETUP_RSSI_POWEROFF_ALARM, - ITEM_SETUP_BACKLIGHT_LABEL, - ITEM_SETUP_BACKLIGHT_MODE, - ITEM_SETUP_BACKLIGHT_DELAY, - ITEM_SETUP_BRIGHTNESS, - CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF) - CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON) - ITEM_SETUP_FLASH_BEEP, - CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH) +enum { + CASE_RTCLOCK(ITEM_RADIO_SETUP_DATE) + CASE_RTCLOCK(ITEM_RADIO_SETUP_TIME) + CASE_BATTGRAPH(ITEM_RADIO_SETUP_BATT_RANGE) + 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, + CASE_AUDIO(ITEM_RADIO_SETUP_SPEAKER_PITCH) + ITEM_RADIO_SETUP_WAV_VOLUME, + ITEM_RADIO_SETUP_BACKGROUND_VOLUME, + CASE_VARIO(ITEM_RADIO_SETUP_VARIO_LABEL) + CASE_VARIO(ITEM_RADIO_SETUP_VARIO_VOLUME) + CASE_VARIO(ITEM_RADIO_SETUP_VARIO_PITCH) + CASE_VARIO(ITEM_RADIO_SETUP_VARIO_RANGE) + CASE_VARIO(ITEM_RADIO_SETUP_VARIO_REPEAT) + CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_LABEL) + CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_MODE) + CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_LENGTH) + CASE_HAPTIC(ITEM_RADIO_SETUP_HAPTIC_STRENGTH) + CASE_GYRO(ITEM_RADIO_SETUP_GYRO_LABEL) + CASE_GYRO(ITEM_RADIO_SETUP_GYRO_MAX) + CASE_GYRO(ITEM_RADIO_SETUP_GYRO_OFFSET) + ITEM_RADIO_SETUP_CONTRAST, + ITEM_RADIO_SETUP_ALARMS_LABEL, + ITEM_RADIO_SETUP_BATTERY_WARNING, + CASE_CAPACITY(ITEM_RADIO_SETUP_CAPACITY_WARNING) + ITEM_RADIO_SETUP_INACTIVITY_ALARM, + ITEM_RADIO_SETUP_MEMORY_WARNING, + ITEM_RADIO_SETUP_ALARM_WARNING, + ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM, + ITEM_RADIO_SETUP_BACKLIGHT_LABEL, + ITEM_RADIO_SETUP_BACKLIGHT_MODE, + ITEM_RADIO_SETUP_BACKLIGHT_DELAY, + ITEM_RADIO_SETUP_BRIGHTNESS, + CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_OFF) + CASE_PWM_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON) + ITEM_RADIO_SETUP_FLASH_BEEP, + CASE_SPLASH_PARAM(ITEM_RADIO_SETUP_DISABLE_SPLASH) #if defined(PXX2) - ITEM_RADIO_OWNER_ID, + ITEM_RADIO_SETUP_OWNER_ID, #endif - CASE_GPS(ITEM_SETUP_TIMEZONE) - ITEM_SETUP_ADJUST_RTC, - CASE_GPS(ITEM_SETUP_GPSFORMAT) - CASE_PXX1(ITEM_SETUP_COUNTRYCODE) - ITEM_SETUP_LANGUAGE, - ITEM_SETUP_IMPERIAL, - IF_FAI_CHOICE(ITEM_SETUP_FAI) - ITEM_SETUP_SWITCHES_DELAY, - CASE_STM32(ITEM_SETUP_USB_MODE) - CASE_JACK_DETECT(ITEM_SETUP_JACK_MODE) - ITEM_SETUP_RX_CHANNEL_ORD, - ITEM_SETUP_STICK_MODE_LABELS, - ITEM_SETUP_STICK_MODE, - ITEM_SETUP_MAX + CASE_GPS(ITEM_RADIO_SETUP_TIMEZONE) + ITEM_RADIO_SETUP_ADJUST_RTC, + CASE_GPS(ITEM_RADIO_SETUP_GPSFORMAT) + CASE_PXX1(ITEM_RADIO_SETUP_COUNTRYCODE) + ITEM_RADIO_SETUP_LANGUAGE, + ITEM_RADIO_SETUP_IMPERIAL, + IF_FAI_CHOICE(ITEM_RADIO_SETUP_FAI) + ITEM_RADIO_SETUP_SWITCHES_DELAY, + CASE_STM32(ITEM_RADIO_SETUP_USB_MODE) + CASE_JACK_DETECT(ITEM_RADIO_SETUP_JACK_MODE) + ITEM_RADIO_SETUP_RX_CHANNEL_ORD, + ITEM_RADIO_SETUP_STICK_MODE_LABELS, + ITEM_RADIO_SETUP_STICK_MODE, + ITEM_RADIO_SETUP_MAX }; #if defined(FRSKY_STICKS) && !defined(PCBTARANIS) @@ -118,7 +118,7 @@ void menuRadioSetup(event_t event) struct gtm t; gettime(&t); - if ((menuVerticalPosition==ITEM_SETUP_DATE+HEADER_LINE || menuVerticalPosition==ITEM_SETUP_TIME+HEADER_LINE) && + if ((menuVerticalPosition==ITEM_RADIO_SETUP_DATE+HEADER_LINE || menuVerticalPosition==ITEM_RADIO_SETUP_TIME+HEADER_LINE) && (s_editMode>0) && (event==EVT_KEY_FIRST(KEY_ENTER) || event==EVT_KEY_FIRST(KEY_EXIT) || IS_ROTARY_BREAK(event) || IS_ROTARY_LONG(event))) { // set the date and time into RTC chip @@ -134,7 +134,7 @@ void menuRadioSetup(event_t event) } #endif - MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_SETUP_MAX, { + MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, HEADER_LINE+ITEM_RADIO_SETUP_MAX, { HEADER_LINE_COLUMNS CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) @@ -183,7 +183,7 @@ void menuRadioSetup(event_t event) switch (k) { #if defined(RTCLOCK) - case ITEM_SETUP_DATE: + case ITEM_RADIO_SETUP_DATE: lcdDrawTextAlignedLeft(y, STR_DATE); for (uint8_t j=0; j<3; j++) { uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0); @@ -215,7 +215,7 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_TIME: + case ITEM_RADIO_SETUP_TIME: lcdDrawTextAlignedLeft(y, STR_TIME); for (uint8_t j=0; j<3; j++) { uint8_t rowattr = (menuHorizontalPosition==j ? attr : 0); @@ -243,7 +243,7 @@ void menuRadioSetup(event_t event) #endif #if defined(BATTGRAPH) - case ITEM_SETUP_BATT_RANGE: + case ITEM_RADIO_SETUP_BATT_RANGE: lcdDrawTextAlignedLeft(y, STR_BATTERY_RANGE); putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|LEFT|NO_UNIT); lcdDrawChar(lcdLastRightPos, y, '-'); @@ -257,28 +257,28 @@ void menuRadioSetup(event_t event) break; #endif - case ITEM_SETUP_SOUND_LABEL: + case ITEM_RADIO_SETUP_SOUND_LABEL: lcdDrawTextAlignedLeft(y, STR_SOUND_LABEL); break; #if defined(AUDIO) - case ITEM_SETUP_BEEP_MODE: + 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); break; #if defined(BUZZER) // AUDIO + BUZZER - case ITEM_SETUP_BUZZER_MODE: + case ITEM_RADIO_SETUP_BUZZER_MODE: g_eeGeneral.buzzerMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr, event); break; #endif #elif defined(BUZZER) // BUZZER only - case ITEM_SETUP_BUZZER_MODE: + case ITEM_RADIO_SETUP_BUZZER_MODE: g_eeGeneral.beepMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); break; #endif #if defined(VOICE) - case ITEM_SETUP_SPEAKER_VOLUME: + case ITEM_RADIO_SETUP_SPEAKER_VOLUME: { lcdDrawTextAlignedLeft(y, STR_SPEAKER_VOLUME); uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; @@ -293,22 +293,22 @@ void menuRadioSetup(event_t event) } #endif - case ITEM_SETUP_BEEP_VOLUME: + case ITEM_RADIO_SETUP_BEEP_VOLUME: SLIDER_5POS(y, g_eeGeneral.beepVolume, STR_BEEP_VOLUME, event, attr); break; - case ITEM_SETUP_WAV_VOLUME: + case ITEM_RADIO_SETUP_WAV_VOLUME: SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr); break; - case ITEM_SETUP_BACKGROUND_VOLUME: + case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr); break; - case ITEM_SETUP_BEEP_LENGTH: + case ITEM_RADIO_SETUP_BEEP_LENGTH: SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr); break; #if defined(AUDIO) - case ITEM_SETUP_SPEAKER_PITCH: + case ITEM_RADIO_SETUP_SPEAKER_PITCH: lcdDrawTextAlignedLeft( y, STR_SPKRPITCH); lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); @@ -320,25 +320,25 @@ void menuRadioSetup(event_t event) #endif #if defined(VARIO) - case ITEM_SETUP_VARIO_LABEL: + case ITEM_RADIO_SETUP_VARIO_LABEL: lcdDrawTextAlignedLeft(y, STR_VARIO); break; - case ITEM_SETUP_VARIO_VOLUME: + case ITEM_RADIO_SETUP_VARIO_VOLUME: SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr); break; - case ITEM_SETUP_VARIO_PITCH: + case ITEM_RADIO_SETUP_VARIO_PITCH: lcdDrawTextAlignedLeft(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_SETUP_VARIO_RANGE: + case ITEM_RADIO_SETUP_VARIO_RANGE: lcdDrawTextAlignedLeft(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_SETUP_VARIO_REPEAT: + case ITEM_RADIO_SETUP_VARIO_REPEAT: lcdDrawTextAlignedLeft(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); @@ -347,29 +347,29 @@ void menuRadioSetup(event_t event) #endif #if defined(HAPTIC) - case ITEM_SETUP_HAPTIC_LABEL: + case ITEM_RADIO_SETUP_HAPTIC_LABEL: lcdDrawTextAlignedLeft(y, STR_HAPTIC_LABEL); break; - case ITEM_SETUP_HAPTIC_MODE: + case ITEM_RADIO_SETUP_HAPTIC_MODE: g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event); break; - case ITEM_SETUP_HAPTIC_LENGTH: + case ITEM_RADIO_SETUP_HAPTIC_LENGTH: SLIDER_5POS(y, g_eeGeneral.hapticLength, STR_LENGTH, event, attr); break; - case ITEM_SETUP_HAPTIC_STRENGTH: + case ITEM_RADIO_SETUP_HAPTIC_STRENGTH: SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr); break; #endif #if defined(GYRO) - case ITEM_SETUP_GYRO_LABEL: + case ITEM_RADIO_SETUP_GYRO_LABEL: lcdDrawTextAlignedLeft(y, STR_GYRO_LABEL); break; - case ITEM_SETUP_GYRO_MAX: + case ITEM_RADIO_SETUP_GYRO_MAX: lcdDrawText(INDENT_WIDTH, y, STR_GYRO_MAX); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, GYRO_MAX_DEFAULT + g_eeGeneral.gyroMax, attr|LEFT); lcdDrawChar(lcdLastRightPos, y, '@', attr); @@ -381,7 +381,7 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_GYRO_OFFSET: + case ITEM_RADIO_SETUP_GYRO_OFFSET: lcdDrawText(INDENT_WIDTH, y, STR_GYRO_OFFSET); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.gyroOffset, attr|LEFT); lcdDrawChar(lcdLastRightPos, y, '@', attr); @@ -394,7 +394,7 @@ void menuRadioSetup(event_t event) break; #endif - case ITEM_SETUP_CONTRAST: + case ITEM_RADIO_SETUP_CONTRAST: lcdDrawTextAlignedLeft(y, STR_CONTRAST); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); if (attr) { @@ -403,31 +403,31 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_ALARMS_LABEL: + case ITEM_RADIO_SETUP_ALARMS_LABEL: lcdDrawTextAlignedLeft(y, STR_ALARMS_LABEL); break; - case ITEM_SETUP_BATTERY_WARNING: + case ITEM_RADIO_SETUP_BATTERY_WARNING: lcdDrawTextAlignedLeft(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_SETUP_MEMORY_WARNING: + case ITEM_RADIO_SETUP_MEMORY_WARNING: { uint8_t b = 1-g_eeGeneral.disableMemoryWarning; g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event); break; } - case ITEM_SETUP_ALARM_WARNING: + case ITEM_RADIO_SETUP_ALARM_WARNING: { uint8_t b = 1 - g_eeGeneral.disableAlarmWarning; g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event); break; } - case ITEM_SETUP_RSSI_POWEROFF_ALARM: + case ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM: { uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm; g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_RSSISHUTDOWNALARM, attr, event); @@ -435,40 +435,40 @@ void menuRadioSetup(event_t event) } #if defined(TX_CAPACITY_MEASUREMENT) - case ITEM_SETUP_CAPACITY_WARNING: + case ITEM_RADIO_SETUP_CAPACITY_WARNING: lcdDrawTextAlignedLeft(y, STR_CAPAWARNING); drawValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.mAhWarn*50, UNIT_MAH, attr|LEFT) ; if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.mAhWarn, 0, 100); break; #endif - case ITEM_SETUP_INACTIVITY_ALARM: + case ITEM_RADIO_SETUP_INACTIVITY_ALARM: lcdDrawTextAlignedLeft(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 break; - case ITEM_SETUP_BACKLIGHT_LABEL: + case ITEM_RADIO_SETUP_BACKLIGHT_LABEL: lcdDrawTextAlignedLeft(y, STR_BACKLIGHT_LABEL); break; - case ITEM_SETUP_BACKLIGHT_MODE: + case ITEM_RADIO_SETUP_BACKLIGHT_MODE: g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); break; - case ITEM_SETUP_FLASH_BEEP: + case ITEM_RADIO_SETUP_FLASH_BEEP: g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event ) ; break; - case ITEM_SETUP_BACKLIGHT_DELAY: + case ITEM_RADIO_SETUP_BACKLIGHT_DELAY: lcdDrawTextAlignedLeft(y, STR_BLDELAY); 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_SETUP_BRIGHTNESS: + case ITEM_RADIO_SETUP_BRIGHTNESS: lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; if (attr) { @@ -479,13 +479,13 @@ void menuRadioSetup(event_t event) break; #if defined(PWM_BACKLIGHT) - case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF: + case ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_OFF: lcdDrawTextAlignedLeft(y, STR_BLOFFBRIGHTNESS); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.blOffBright, attr|LEFT); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.blOffBright, 0, 15); break; - case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON: + case ITEM_RADIO_SETUP_BACKLIGHT_BRIGHTNESS_ON: lcdDrawTextAlignedLeft(y, STR_BLONBRIGHTNESS); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 15-g_eeGeneral.blOnBright, attr|LEFT); if (attr) g_eeGeneral.blOnBright = 15 - checkIncDecGen(event, 15-g_eeGeneral.blOnBright, 0, 15); @@ -493,7 +493,7 @@ void menuRadioSetup(event_t event) #endif #if defined(SPLASH) - case ITEM_SETUP_DISABLE_SPLASH: + case ITEM_RADIO_SETUP_DISABLE_SPLASH: { lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); if (SPLASH_NEEDED()) { @@ -509,34 +509,34 @@ void menuRadioSetup(event_t event) #endif #if defined(PXX2) - case ITEM_RADIO_OWNER_ID: + case ITEM_RADIO_SETUP_OWNER_ID: editSingleName(RADIO_SETUP_2ND_COLUMN, y, STR_OWNER_ID, g_eeGeneral.ownerRegistrationID, PXX2_LEN_REGISTRATION_ID, event, attr); break; #endif #if defined(TELEMETRY_FRSKY) && defined(GPS) - case ITEM_SETUP_TIMEZONE: + case ITEM_RADIO_SETUP_TIMEZONE: lcdDrawTextAlignedLeft(y, STR_TIMEZONE); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12); break; - case ITEM_SETUP_ADJUST_RTC: + case ITEM_RADIO_SETUP_ADJUST_RTC: g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, STR_ADJUST_RTC, attr, event); break; - case ITEM_SETUP_GPSFORMAT: + case ITEM_RADIO_SETUP_GPSFORMAT: g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_GPSCOORD, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event); break; #endif #if defined(PXX) - case ITEM_SETUP_COUNTRYCODE: + case ITEM_RADIO_SETUP_COUNTRYCODE: g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); break; #endif - case ITEM_SETUP_LANGUAGE: + case ITEM_RADIO_SETUP_LANGUAGE: lcdDrawTextAlignedLeft(y, STR_VOICELANG); lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr); if (attr) { @@ -548,12 +548,12 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_IMPERIAL: + case ITEM_RADIO_SETUP_IMPERIAL: g_eeGeneral.imperial = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event); break; #if defined(FAI_CHOICE) - case ITEM_SETUP_FAI: + case ITEM_RADIO_SETUP_FAI: editCheckBox(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, "FAI Mode", attr, event); if (attr && checkIncDec_Ret) { if (g_eeGeneral.fai) @@ -565,7 +565,7 @@ void menuRadioSetup(event_t event) #endif - case ITEM_SETUP_SWITCHES_DELAY: + case ITEM_RADIO_SETUP_SWITCHES_DELAY: lcdDrawTextAlignedLeft(y, STR_SWITCHES_DELAY); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS, attr); @@ -573,18 +573,18 @@ void menuRadioSetup(event_t event) break; #if defined(STM32) - case ITEM_SETUP_USB_MODE: + case ITEM_RADIO_SETUP_USB_MODE: g_eeGeneral.USBMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_USBMODE, STR_USBMODES, g_eeGeneral.USBMode, USB_UNSELECTED_MODE, USB_MAX_MODE, attr, event); break; #endif #if defined(JACK_DETECT_GPIO) - case ITEM_SETUP_JACK_MODE: + case ITEM_RADIO_SETUP_JACK_MODE: g_eeGeneral.jackMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_JACKMODE, STR_JACKMODES, g_eeGeneral.jackMode, JACK_UNSELECTED_MODE, JACK_MAX_MODE, attr, event); break; #endif - case ITEM_SETUP_RX_CHANNEL_ORD: + case ITEM_RADIO_SETUP_RX_CHANNEL_ORD: lcdDrawTextAlignedLeft(y, STR_RXCHANNELORD); // RAET->AETR for (uint8_t i=1; i<=4; i++) { putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channelOrder(i), attr); @@ -592,7 +592,7 @@ void menuRadioSetup(event_t event) if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23); break; - case ITEM_SETUP_STICK_MODE_LABELS: + case ITEM_RADIO_SETUP_STICK_MODE_LABELS: lcdDrawTextAlignedLeft(y, STR_MODE); for (uint8_t i=0; i<4; i++) { lcdDraw1bitBitmap(5*FW+i*(4*FW+2), y, sticks, i, 0); @@ -611,7 +611,7 @@ void menuRadioSetup(event_t event) #endif break; - case ITEM_SETUP_STICK_MODE: + case ITEM_RADIO_SETUP_STICK_MODE: lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr); for (uint8_t i=0; i0) && (event==EVT_KEY_FIRST(KEY_ENTER) || event==EVT_KEY_BREAK(KEY_ENTER) || event==EVT_KEY_LONG(KEY_ENTER) || event==EVT_KEY_FIRST(KEY_EXIT))) { // set the date and time into RTC chip @@ -116,7 +116,7 @@ void menuRadioSetup(event_t event) } #endif - MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, ITEM_SETUP_MAX, { 2, 2, 0, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, 0, 0, 0, 0, LABEL(BACKLIGHT), 0, 0, 0, CASE_PCBX9E_PCBX9DP(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX1(0) 0, 0, IF_FAI_CHOICE(0) 0, 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ }); + MENU(STR_MENURADIOSETUP, menuTabGeneral, MENU_RADIO_SETUP, ITEM_RADIO_SETUP_MAX, { 2, 2, 0, 1, LABEL(SOUND), 0, 0, 0, 0, 0, 0, 0, CASE_VARIO(LABEL(VARIO)) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_VARIO(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, 0, 0, 0, 0, LABEL(BACKLIGHT), 0, 0, 0, CASE_PCBX9E_PCBX9DP(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(LABEL(GPS)) CASE_GPS(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX1(0) 0, 0, IF_FAI_CHOICE(0) 0, 0, 0, LABEL(TX_MODE), 0, 1/*to force edit mode*/ }); if (event == EVT_ENTRY) { reusableBuffer.generalSettings.stickMode = g_eeGeneral.stickMode; @@ -131,7 +131,7 @@ void menuRadioSetup(event_t event) uint8_t attr = (sub == k ? blink : 0); switch (k) { - case ITEM_SETUP_DATE: + case ITEM_RADIO_SETUP_DATE: lcdDrawTextAlignedLeft(y, STR_DATE); lcdDrawChar(RADIO_SETUP_DATE_COLUMN, y, '-'); lcdDrawChar(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-'); for (uint8_t j=0; j<3; j++) { @@ -163,7 +163,7 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_TIME: + case ITEM_RADIO_SETUP_TIME: lcdDrawTextAlignedLeft(y, STR_TIME); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcdDrawChar(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':'); for (uint8_t j=0; j<3; j++) { @@ -189,7 +189,7 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_BATTERY_CALIB: + case ITEM_RADIO_SETUP_BATTERY_CALIB: lcdDrawTextAlignedLeft(y, STR_BATT_CALIB); putsVolts(RADIO_SETUP_2ND_COLUMN, y, getBatteryVoltage(), attr | PREC2 | LEFT); if (attr && s_editMode > 0) { @@ -197,7 +197,7 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_BATTERY_RANGE: + case ITEM_RADIO_SETUP_BATTERY_RANGE: lcdDrawTextAlignedLeft(y, STR_BATTERY_RANGE); putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (menuHorizontalPosition==0 ? attr : 0)|LEFT|NO_UNIT); lcdDrawChar(lcdLastRightPos, y, '-'); @@ -211,15 +211,15 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_SOUND_LABEL: + case ITEM_RADIO_SETUP_SOUND_LABEL: lcdDrawTextAlignedLeft(y, STR_SOUND_LABEL); break; - case ITEM_SETUP_BEEP_MODE: + 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); break; - case ITEM_SETUP_GENERAL_VOLUME: + case ITEM_RADIO_SETUP_GENERAL_VOLUME: { lcdDrawTextAlignedLeft(y, STR_SPEAKER_VOLUME); uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; @@ -233,23 +233,23 @@ void menuRadioSetup(event_t event) break; } - case ITEM_SETUP_BEEP_VOLUME: + case ITEM_RADIO_SETUP_BEEP_VOLUME: SLIDER_5POS(y, g_eeGeneral.beepVolume, STR_BEEP_VOLUME, event, attr); break; - case ITEM_SETUP_WAV_VOLUME: + case ITEM_RADIO_SETUP_WAV_VOLUME: SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr); break; - case ITEM_SETUP_BACKGROUND_VOLUME: + case ITEM_RADIO_SETUP_BACKGROUND_VOLUME: SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr); break; - case ITEM_SETUP_BEEP_LENGTH: + case ITEM_RADIO_SETUP_BEEP_LENGTH: SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr); break; - case ITEM_SETUP_SPEAKER_PITCH: + case ITEM_RADIO_SETUP_SPEAKER_PITCH: lcdDrawTextAlignedLeft( y, STR_SPKRPITCH); lcdDrawChar(RADIO_SETUP_2ND_COLUMN, y, '+', attr); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); @@ -260,29 +260,29 @@ void menuRadioSetup(event_t event) break; #if defined(VARIO) - case ITEM_SETUP_VARIO_LABEL: + case ITEM_RADIO_SETUP_VARIO_LABEL: lcdDrawTextAlignedLeft(y, STR_VARIO); break; - case ITEM_SETUP_VARIO_VOLUME: + case ITEM_RADIO_SETUP_VARIO_VOLUME: SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr); break; - case ITEM_SETUP_VARIO_PITCH: + case ITEM_RADIO_SETUP_VARIO_PITCH: lcdDrawTextAlignedLeft(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_SETUP_VARIO_RANGE: + case ITEM_RADIO_SETUP_VARIO_RANGE: lcdDrawTextAlignedLeft(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_SETUP_VARIO_REPEAT: + case ITEM_RADIO_SETUP_VARIO_REPEAT: lcdDrawTextAlignedLeft(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); @@ -291,24 +291,24 @@ void menuRadioSetup(event_t event) #endif #if defined(HAPTIC) - case ITEM_SETUP_HAPTIC_LABEL: + case ITEM_RADIO_SETUP_HAPTIC_LABEL: lcdDrawTextAlignedLeft(y, STR_HAPTIC_LABEL); break; - case ITEM_SETUP_HAPTIC_MODE: + case ITEM_RADIO_SETUP_HAPTIC_MODE: g_eeGeneral.hapticMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event); break; - case ITEM_SETUP_HAPTIC_LENGTH: + case ITEM_RADIO_SETUP_HAPTIC_LENGTH: SLIDER_5POS(y, g_eeGeneral.hapticLength, STR_LENGTH, event, attr); break; - case ITEM_SETUP_HAPTIC_STRENGTH: + case ITEM_RADIO_SETUP_HAPTIC_STRENGTH: SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr); break; #endif - case ITEM_SETUP_CONTRAST: + case ITEM_RADIO_SETUP_CONTRAST: lcdDrawTextAlignedLeft(y, STR_CONTRAST); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); if (attr) { @@ -317,64 +317,64 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_ALARMS_LABEL: + case ITEM_RADIO_SETUP_ALARMS_LABEL: lcdDrawTextAlignedLeft(y, STR_ALARMS_LABEL); break; - case ITEM_SETUP_BATTERY_WARNING: + case ITEM_RADIO_SETUP_BATTERY_WARNING: lcdDrawTextAlignedLeft(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_SETUP_MEMORY_WARNING: + case ITEM_RADIO_SETUP_MEMORY_WARNING: { uint8_t b = 1 - g_eeGeneral.disableMemoryWarning; g_eeGeneral.disableMemoryWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event); break; } - case ITEM_SETUP_ALARM_WARNING: + case ITEM_RADIO_SETUP_ALARM_WARNING: { uint8_t b = 1 - g_eeGeneral.disableAlarmWarning; g_eeGeneral.disableAlarmWarning = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event); break; } - case ITEM_SETUP_RSSI_POWEROFF_ALARM: + case ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM: { uint8_t b = 1 - g_eeGeneral.disableRssiPoweroffAlarm; g_eeGeneral.disableRssiPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, STR_RSSISHUTDOWNALARM, attr, event); break; } - case ITEM_SETUP_INACTIVITY_ALARM: + case ITEM_RADIO_SETUP_INACTIVITY_ALARM: lcdDrawTextAlignedLeft(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 break; - case ITEM_SETUP_BACKLIGHT_LABEL: + case ITEM_RADIO_SETUP_BACKLIGHT_LABEL: lcdDrawTextAlignedLeft(y, STR_BACKLIGHT_LABEL); break; - case ITEM_SETUP_BACKLIGHT_MODE: + case ITEM_RADIO_SETUP_BACKLIGHT_MODE: g_eeGeneral.backlightMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, INDENT TR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); break; - case ITEM_SETUP_FLASH_BEEP: + case ITEM_RADIO_SETUP_FLASH_BEEP: g_eeGeneral.alarmsFlash = editCheckBox(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event ) ; break; - case ITEM_SETUP_BACKLIGHT_DELAY: + case ITEM_RADIO_SETUP_BACKLIGHT_DELAY: lcdDrawTextAlignedLeft(y, STR_BLDELAY); 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_SETUP_BRIGHTNESS: + case ITEM_RADIO_SETUP_BRIGHTNESS: lcdDrawTextAlignedLeft(y, STR_BRIGHTNESS); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; if (attr) { @@ -385,7 +385,7 @@ void menuRadioSetup(event_t event) break; #if defined(PCBX9DP) || defined(PCBX9E) - case ITEM_SETUP_BACKLIGHT_COLOR: + case ITEM_RADIO_SETUP_BACKLIGHT_COLOR: lcdDrawTextAlignedLeft(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); @@ -393,7 +393,7 @@ void menuRadioSetup(event_t event) #endif #if defined(SPLASH) - case ITEM_SETUP_DISABLE_SPLASH: + case ITEM_RADIO_SETUP_DISABLE_SPLASH: { lcdDrawTextAlignedLeft(y, STR_SPLASHSCREEN); if (SPLASH_NEEDED()) { @@ -409,32 +409,32 @@ void menuRadioSetup(event_t event) #endif #if defined(TELEMETRY_FRSKY) && defined(GPS) - case ITEM_SETUP_LABEL_GPS: + case ITEM_RADIO_SETUP_LABEL_GPS: lcdDrawTextAlignedLeft(y, STR_GPS); break; - case ITEM_SETUP_TIMEZONE: + case ITEM_RADIO_SETUP_TIMEZONE: lcdDrawTextAlignedLeft(y, STR_TIMEZONE); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.timezone, attr|LEFT); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.timezone, -12, 12); break; - case ITEM_SETUP_ADJUST_RTC: + case ITEM_RADIO_SETUP_ADJUST_RTC: g_eeGeneral.adjustRTC = editCheckBox(g_eeGeneral.adjustRTC, RADIO_SETUP_2ND_COLUMN, y, STR_ADJUST_RTC, attr, event); break; - case ITEM_SETUP_GPSFORMAT: + case ITEM_RADIO_SETUP_GPSFORMAT: g_eeGeneral.gpsFormat = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_GPSCOORD, STR_GPSFORMAT, g_eeGeneral.gpsFormat, 0, 1, attr, event); break; #endif #if defined(PXX) - case ITEM_SETUP_COUNTRYCODE: + case ITEM_RADIO_SETUP_COUNTRYCODE: g_eeGeneral.countryCode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); break; #endif - case ITEM_SETUP_LANGUAGE: + case ITEM_RADIO_SETUP_LANGUAGE: lcdDrawTextAlignedLeft(y, STR_VOICELANG); lcdDrawText(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr); if (attr) { @@ -446,12 +446,12 @@ void menuRadioSetup(event_t event) } break; - case ITEM_SETUP_IMPERIAL: + case ITEM_RADIO_SETUP_IMPERIAL: g_eeGeneral.imperial = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event); break; #if defined(FAI_CHOICE) - case ITEM_SETUP_FAI: + case ITEM_RADIO_SETUP_FAI: editCheckBox(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, "FAI Mode"), attr, event; if (attr && checkIncDec_Ret) { if (g_eeGeneral.fai) @@ -463,18 +463,18 @@ void menuRadioSetup(event_t event) #endif - case ITEM_SETUP_SWITCHES_DELAY: + case ITEM_RADIO_SETUP_SWITCHES_DELAY: lcdDrawTextAlignedLeft(y, STR_SWITCHES_DELAY); lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT); lcdDrawText(lcdLastRightPos, y, STR_MS, attr); if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, 100-15); break; - case ITEM_SETUP_USB_MODE: + case ITEM_RADIO_SETUP_USB_MODE: g_eeGeneral.USBMode = editChoice(RADIO_SETUP_2ND_COLUMN, y, STR_USBMODE, STR_USBMODES, g_eeGeneral.USBMode, USB_UNSELECTED_MODE, USB_MAX_MODE, attr, event); break; - case ITEM_SETUP_RX_CHANNEL_ORD: + case ITEM_RADIO_SETUP_RX_CHANNEL_ORD: lcdDrawTextAlignedLeft(y, STR_RXCHANNELORD); // RAET->AETR for (uint8_t i=1; i<=4; i++) { putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channelOrder(i), attr); @@ -482,14 +482,14 @@ void menuRadioSetup(event_t event) if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23); break; - case ITEM_SETUP_STICK_MODE_LABELS: + case ITEM_RADIO_SETUP_STICK_MODE_LABELS: lcdDrawTextAlignedLeft(y, STR_MODE); for (uint8_t i=0; i<4; i++) { lcdDraw1bitBitmap((6+4*i)*FW, y, sticks, i, 0); } break; - case ITEM_SETUP_STICK_MODE: + case ITEM_RADIO_SETUP_STICK_MODE: lcdDrawChar(2*FW, y, '1'+reusableBuffer.generalSettings.stickMode, attr); for (uint8_t i=0; i<4; i++) { putsStickName((6+4*i)*FW, y, *(modn12x3 + 4*reusableBuffer.generalSettings.stickMode + i), 0);