diff --git a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp index 4500892ce..c27b48553 100644 --- a/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp +++ b/companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp @@ -87,6 +87,7 @@ namespace Open9xGruvin9x { #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_model_templates.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" #include "radio/src/gui/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_telemetry.cpp" diff --git a/companion/src/firmwares/opentx/opentxM128simulator.cpp b/companion/src/firmwares/opentx/opentxM128simulator.cpp index d930f2ebc..093ec5e6f 100644 --- a/companion/src/firmwares/opentx/opentxM128simulator.cpp +++ b/companion/src/firmwares/opentx/opentxM128simulator.cpp @@ -88,6 +88,7 @@ namespace OpenTxM128 { #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_model_templates.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" #include "radio/src/gui/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_telemetry.cpp" diff --git a/companion/src/firmwares/opentx/opentxM64simulator.cpp b/companion/src/firmwares/opentx/opentxM64simulator.cpp index 78d1620d9..c2f4a7e32 100644 --- a/companion/src/firmwares/opentx/opentxM64simulator.cpp +++ b/companion/src/firmwares/opentx/opentxM64simulator.cpp @@ -93,6 +93,7 @@ namespace OpenTxM64 { #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_model_templates.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" #include "radio/src/gui/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_telemetry.cpp" diff --git a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp index df71ff328..ddadbc0ee 100644 --- a/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp +++ b/companion/src/firmwares/opentx/opentxSky9xsimulator.cpp @@ -102,6 +102,8 @@ namespace Open9xSky9x { #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_model_templates.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" +#include "radio/src/gui/menu_general_hardware.cpp" #include "radio/src/gui/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_telemetry.cpp" diff --git a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp index 6e43b4386..ef0b51974 100644 --- a/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisSimulator.cpp @@ -109,6 +109,8 @@ inline int geteepromsize() { #include "radio/src/gui/menu_model_limits.cpp" #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" +#include "radio/src/gui/menu_general_hardware.cpp" #include "radio/src/gui/Taranis/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_channels.cpp" diff --git a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp index 0bd40e21c..3ab3482cb 100755 --- a/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp +++ b/companion/src/firmwares/opentx/opentxTaranisX9ESimulator.cpp @@ -111,6 +111,8 @@ inline int geteepromsize() { #include "radio/src/gui/menu_model_gvars.cpp" #include "radio/src/gui/menu_model_telemetry.cpp" #include "radio/src/gui/menu_general.cpp" +#include "radio/src/gui/menu_general_setup.cpp" +#include "radio/src/gui/menu_general_hardware.cpp" #include "radio/src/gui/Taranis/view_main.cpp" #include "radio/src/gui/view_statistics.cpp" #include "radio/src/gui/view_channels.cpp" diff --git a/radio/src/Makefile b/radio/src/Makefile index bc7e5dedf..829c1eae9 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -366,6 +366,7 @@ M2561_VARIANT = +16384 EEPROM_VARIANT = 0 GUIMODELSRC = gui/menu_model.cpp gui/menu_model_select.cpp gui/menu_model_setup.cpp gui/menu_model_inputs_mixes.cpp gui/menu_model_limits.cpp gui/menu_model_logical_switches.cpp gui/menu_model_custom_functions.cpp gui/menu_model_telemetry.cpp +GUIGENERALSRC = gui/menu_general.cpp gui/menu_general_setup.cpp ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR)) # 9x/9xr radio @@ -672,6 +673,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO)) CPPDEFS += -DSPORT_FILE_LOG endif INCDIRS += targets/sky9x CoOS/kernel CoOS/portable + GUIGENERALSRC += gui/menu_general_hardware.cpp BOARDSRC = main_arm.cpp targets/sky9x/board_sky9x.cpp EXTRABOARDSRC = targets/sky9x/lcd_driver.cpp SRC += targets/sky9x/core_cm3.c targets/sky9x/board_lowlevel.c targets/sky9x/crt.c targets/sky9x/vectors_sam3s.c @@ -777,6 +779,7 @@ ifeq ($(PCB), TARANIS) EXTRAINCDIRS += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/inc targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Include targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/include EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_OTG_Driver/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Core/inc EXTRAINCDIRS += targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/inc targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/hid/inc + GUIGENERALSRC += gui/menu_general_hardware.cpp BOARDSRC = main_arm.cpp targets/taranis/board_taranis.cpp EXTRABOARDSRC += targets/taranis/configure_pins.cpp targets/taranis/lcd_driver.cpp targets/taranis/flash_driver.cpp targets/taranis/aspi.c targets/taranis/i2c.c targets/taranis/delays.c SRC += CoOS/kernel/core.c CoOS/kernel/hook.c CoOS/kernel/task.c CoOS/kernel/event.c CoOS/kernel/time.c CoOS/kernel/timer.c CoOS/kernel/flag.c CoOS/kernel/mutex.c CoOS/kernel/serviceReq.c CoOS/portable/GCC/port.c CoOS/portable/arch.c @@ -905,9 +908,9 @@ else endif ifeq ($(PCB), TARANIS) - GUISRC = gui/menus.cpp $(GUIMODELSRC) gui/menu_general.cpp gui/Taranis/view_main.cpp gui/view_statistics.cpp + GUISRC = gui/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/Taranis/view_main.cpp gui/view_statistics.cpp else - GUISRC = gui/menus.cpp $(GUIMODELSRC) gui/menu_general.cpp gui/view_main.cpp gui/view_statistics.cpp + GUISRC = gui/menus.cpp $(GUIMODELSRC) $(GUIGENERALSRC) gui/view_main.cpp gui/view_statistics.cpp endif CPPSRC += opentx.cpp functions.cpp strhelpers.cpp $(PULSESSRC) switches.cpp curves.cpp mixer.cpp stamp.cpp $(GUISRC) $(EEPROMSRC) $(LCDSRC) keys.cpp maths.cpp translations.cpp fonts.cpp $(TTS_SRC) diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp index 7d7f52afc..7f0902ebb 100644 --- a/radio/src/gui/menu_general.cpp +++ b/radio/src/gui/menu_general.cpp @@ -104,589 +104,6 @@ const MenuFuncP_PROGMEM menuTabGeneral[] PROGMEM = { menuGeneralCalib }; -#if LCD_W >= 212 - #define RADIO_SETUP_2ND_COLUMN (LCD_W-10*FW-MENUS_SCROLLBAR_WIDTH) - #define RADIO_SETUP_DATE_COLUMN RADIO_SETUP_2ND_COLUMN + 4*FWNUM - #define RADIO_SETUP_TIME_COLUMN RADIO_SETUP_2ND_COLUMN + 2*FWNUM -#else - #define RADIO_SETUP_2ND_COLUMN (LCD_W-6*FW-3-MENUS_SCROLLBAR_WIDTH) - #define RADIO_SETUP_TIME_COLUMN (FW*15+9) - #define RADIO_SETUP_DATE_COLUMN (FW*15+7) -#endif - -#if !defined(CPUM64) - #define SLIDER_5POS(y, value, label, event, attr) { \ - int8_t tmp = value; \ - displaySlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \ - value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ - } -#elif defined(GRAPHICS) - #define SLIDER_5POS(y, value, label, event, attr) { \ - int8_t tmp = value; \ - display5posSlider(RADIO_SETUP_2ND_COLUMN, y, tmp, attr); \ - value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ - } -#else - #define SLIDER_5POS(y, value, label, event, attr) value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, STR_VBEEPLEN, value, -2, +2, attr, event) -#endif - -#if defined(SPLASH) && !defined(FSPLASH) - #define CASE_SPLASH_PARAM(x) x, -#else - #define CASE_SPLASH_PARAM(x) -#endif - -enum menuGeneralSetupItems { - 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) - CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME) - CASE_CPUARM(ITEM_SETUP_BEEP_VOLUME) - ITEM_SETUP_BEEP_LENGTH, - CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) - CASE_CPUARM(ITEM_SETUP_WAV_VOLUME) - CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) - CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) - CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) - CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) - CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE) - CASE_VARIO_CPUARM(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) - ITEM_SETUP_CONTRAST, - ITEM_SETUP_ALARMS_LABEL, - ITEM_SETUP_BATTERY_WARNING, - CASE_PCBSKY9X(ITEM_SETUP_CAPACITY_WARNING) - CASE_PCBSKY9X(ITEM_SETUP_TEMPERATURE_WARNING) - ITEM_SETUP_INACTIVITY_ALARM, - ITEM_SETUP_MEMORY_WARNING, - ITEM_SETUP_ALARM_WARNING, - IF_ROTARY_ENCODERS(ITEM_SETUP_RE_NAVIGATION) - ITEM_SETUP_BACKLIGHT_LABEL, - ITEM_SETUP_BACKLIGHT_MODE, - ITEM_SETUP_BACKLIGHT_DELAY, - CASE_CPUARM(ITEM_SETUP_BRIGHTNESS) - CASE_REVPLUS(ITEM_SETUP_BACKLIGHT_COLOR) - 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) - CASE_GPS(ITEM_SETUP_TIMEZONE) - CASE_GPS(ITEM_SETUP_GPSFORMAT) - CASE_PXX(ITEM_SETUP_COUNTRYCODE) - CASE_CPUARM(ITEM_SETUP_LANGUAGE) - CASE_CPUARM(ITEM_SETUP_IMPERIAL) - IF_FAI_CHOICE(ITEM_SETUP_FAI) - CASE_MAVLINK(ITEM_MAVLINK_BAUD) - CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY) - ITEM_SETUP_RX_CHANNEL_ORD, - ITEM_SETUP_STICK_MODE_LABELS, - ITEM_SETUP_STICK_MODE, - ITEM_SETUP_MAX -}; - -#if defined(FRSKY_STICKS) - #define COL_TX_MODE 0 -#else - #define COL_TX_MODE LABEL(TX_MODE) -#endif - -void menuGeneralSetup(uint8_t event) -{ -#if defined(RTCLOCK) - struct gtm t; - gettime(&t); - - if ((m_posVert==ITEM_SETUP_DATE+1 || m_posVert==ITEM_SETUP_TIME+1) && - (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 - rtcSetTime(&t); - } -#endif - -#if defined(FAI_CHOICE) - if (s_warning_result) { - s_warning_result = 0; - g_eeGeneral.fai = true; - eeDirty(EE_GENERAL); - } -#endif - - MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/}); - - uint8_t sub = m_posVert - 1; - - for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); - uint8_t attr = (sub == k ? blink : 0); - - switch(k) { -#if defined(RTCLOCK) - case ITEM_SETUP_DATE: - lcd_putsLeft(y, STR_DATE); - lcd_putc(RADIO_SETUP_DATE_COLUMN, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-'); - for (uint8_t j=0; j<3; j++) { - uint8_t rowattr = (m_posHorz==j ? attr : 0); - switch (j) { - case 0: - lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0); - break; - case 1: - lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0); - break; - case 2: - { - int16_t year = 1900 + t.tm_year; - int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0); - static const pm_uint8_t dmon[] PROGMEM = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - dlim += pgm_read_byte(&dmon[t.tm_mon]); - lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); - break; - } - } - } -#if defined(PCBTARANIS) - if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); -#endif - if (attr && checkIncDec_Ret) { - g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated - } - break; - - case ITEM_SETUP_TIME: - lcd_putsLeft(y, STR_TIME); - lcd_putc(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':'); - for (uint8_t j=0; j<3; j++) { - uint8_t rowattr = (m_posHorz==j ? attr : 0); - switch (j) { - case 0: - lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0); - break; - case 1: - lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0); - break; - case 2: - lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2); - if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0); - break; - } - } -#if defined(PCBTARANIS) - if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); -#endif - if (attr && checkIncDec_Ret) - g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated - break; -#endif - -#if defined(BATTGRAPH) || defined(PCBTARANIS) - case ITEM_SETUP_BATT_RANGE: - lcd_putsLeft(y, STR_BATTERY_RANGE); - putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (m_posHorz==0 ? attr : 0)|LEFT|NO_UNIT); - lcd_putc(lcdLastPos, y, '-'); - putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (m_posHorz>0 ? attr : 0)|LEFT|NO_UNIT); -#if defined(PCBTARANIS) - if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); -#endif - if (attr && s_editMode>0) { - if (m_posHorz==0) - CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMin, -50, g_eeGeneral.vBatMax+29); // min=4.0V - else - CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMax, g_eeGeneral.vBatMin-29, +40); // max=16.0V - } - break; -#endif - - case ITEM_SETUP_SOUND_LABEL: - lcd_putsLeft(y, STR_SOUND_LABEL); - break; - -#if defined(AUDIO) - case ITEM_SETUP_BEEP_MODE: - g_eeGeneral.beepMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); -#if defined(FRSKY) - if (attr && checkIncDec_Ret) frskySendAlarms(); -#endif - break; - -#if defined(BUZZER) - case ITEM_SETUP_BUZZER_MODE: - g_eeGeneral.buzzerMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr, event); -#if defined(FRSKY) - if (attr && checkIncDec_Ret) frskySendAlarms(); -#endif - break; -#endif -#else - case ITEM_SETUP_BUZZER_MODE: - g_eeGeneral.beepMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); -#if defined(FRSKY) - if (attr && checkIncDec_Ret) frskySendAlarms(); -#endif - break; -#endif - -#if defined(VOICE) - case ITEM_SETUP_SPEAKER_VOLUME: - { - lcd_putsLeft(y, STR_SPEAKER_VOLUME); - uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; - displaySlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr); - if (attr) { - CHECK_INCDEC_GENVAR(event, b, 0, VOLUME_LEVEL_MAX); - if (checkIncDec_Ret) { - g_eeGeneral.speakerVolume = (int8_t)b-VOLUME_LEVEL_DEF; -#if !defined(CPUARM) - setVolume(b); -#endif - } - } - break; - } -#endif - -#if defined(CPUARM) - case ITEM_SETUP_BEEP_VOLUME: - SLIDER_5POS(y, g_eeGeneral.beepVolume, STR_BEEP_VOLUME, event, attr); - break; - case ITEM_SETUP_WAV_VOLUME: - SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr); - break; - case ITEM_SETUP_BACKGROUND_VOLUME: - SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr); - break; -#endif - - case ITEM_SETUP_BEEP_LENGTH: - SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr); - break; - -#if defined(AUDIO) - case ITEM_SETUP_SPEAKER_PITCH: - lcd_putsLeft( y, STR_SPKRPITCH); -#if defined(CPUARM) - lcd_putcAtt(RADIO_SETUP_2ND_COLUMN, y, '+', attr); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); - lcd_putsAtt(lcdLastPos, y, "Hz", attr); -#else - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.speakerPitch, attr|LEFT); -#endif - if (attr) { - CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20); - } - break; -#endif - -#if defined(CPUARM) && defined(VARIO) - case ITEM_SETUP_VARIO_LABEL: - lcd_putsLeft(y, STR_VARIO); - break; - case ITEM_SETUP_VARIO_VOLUME: - SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr); - break; - case ITEM_SETUP_VARIO_PITCH: - lcd_putsLeft(y, STR_PITCH_AT_ZERO); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT); - lcd_putsAtt(lcdLastPos, y, "Hz", attr); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40); - break; - case ITEM_SETUP_VARIO_RANGE: - lcd_putsLeft(y, STR_PITCH_AT_MAX); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT); - lcd_putsAtt(lcdLastPos, y, "Hz", attr); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80); - break; - case ITEM_SETUP_VARIO_REPEAT: - lcd_putsLeft(y, STR_REPEAT_AT_ZERO); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT); - lcd_putsAtt(lcdLastPos, y, STR_MS, attr); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50); - break; -#endif - -#if defined(HAPTIC) - case ITEM_SETUP_HAPTIC_LABEL: - lcd_putsLeft(y, STR_HAPTIC_LABEL); - break; - - case ITEM_SETUP_HAPTIC_MODE: - g_eeGeneral.hapticMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event); - break; - - case ITEM_SETUP_HAPTIC_LENGTH: - SLIDER_5POS(y, g_eeGeneral.hapticLength, STR_LENGTH, event, attr); - break; - - case ITEM_SETUP_HAPTIC_STRENGTH: - SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr); - break; -#endif - - case ITEM_SETUP_CONTRAST: - lcd_putsLeft(y, STR_CONTRAST); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); - if (attr) { - CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, CONTRAST_MIN, CONTRAST_MAX); - lcdSetContrast(); - } - break; - - case ITEM_SETUP_ALARMS_LABEL: - lcd_putsLeft(y, STR_ALARMS_LABEL); - break; - - case ITEM_SETUP_BATTERY_WARNING: - lcd_putsLeft(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: - { - uint8_t b = 1-g_eeGeneral.disableMemoryWarning; - g_eeGeneral.disableMemoryWarning = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event); - break; - } - - case ITEM_SETUP_ALARM_WARNING: - { - uint8_t b = 1-g_eeGeneral.disableAlarmWarning; - g_eeGeneral.disableAlarmWarning = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event); - break; - } - -#if defined(PCBSKY9X) - case ITEM_SETUP_CAPACITY_WARNING: - lcd_putsLeft(y, STR_CAPAWARNING); - putsValueWithUnit(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 - -#if defined(PCBSKY9X) - case ITEM_SETUP_TEMPERATURE_WARNING: - lcd_putsLeft(y, STR_TEMPWARNING); - putsValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_TEMPERATURE, attr|LEFT) ; - if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureWarn, 0, 120); // 0 means no alarm - break; -#endif - - case ITEM_SETUP_INACTIVITY_ALARM: - lcd_putsLeft( y,STR_INACTIVITYALARM); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT); - lcd_putc(lcdLastPos, y, 'm'); - if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes - break; - -#if ROTARY_ENCODERS > 0 - case ITEM_SETUP_RE_NAVIGATION: - g_eeGeneral.reNavigation = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_RENAVIG, STR_VRENAVIG, g_eeGeneral.reNavigation, 0, NUM_ROTARY_ENCODERS, attr, event); - if (attr && checkIncDec_Ret) { - g_rotenc[NAVIGATION_RE_IDX()] = 0; - } - break; -#endif - - case ITEM_SETUP_BACKLIGHT_LABEL: - lcd_putsLeft(y, STR_BACKLIGHT_LABEL); - break; - - case ITEM_SETUP_BACKLIGHT_MODE: - g_eeGeneral.backlightMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); - break; - - case ITEM_SETUP_FLASH_BEEP: - g_eeGeneral.alarmsFlash = onoffMenuItem(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event ) ; - break; - - case ITEM_SETUP_BACKLIGHT_DELAY: - lcd_putsLeft(y, STR_BLDELAY); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT); - lcd_putc(lcdLastPos, y, 's'); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5); - break; - -#if defined(CPUARM) - case ITEM_SETUP_BRIGHTNESS: - lcd_putsLeft(y, STR_BRIGHTNESS); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; - if (attr) { - uint8_t b = 100 - g_eeGeneral.backlightBright; - CHECK_INCDEC_GENVAR(event, b, 0, 100); - g_eeGeneral.backlightBright = 100 - b; - } - break; -#endif - -#if defined(PCBTARANIS) && defined(REVPLUS) - case ITEM_SETUP_BACKLIGHT_COLOR: - lcd_putsLeft(y, STR_BLCOLOR); - displaySlider(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; -#endif - -#if defined(PWM_BACKLIGHT) - case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF: - lcd_putsLeft(y, STR_BLOFFBRIGHTNESS); - lcd_outdezAtt(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: - lcd_putsLeft(y, STR_BLONBRIGHTNESS); - lcd_outdezAtt(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); - break; -#endif - -#if defined(SPLASH) && !defined(FSPLASH) - case ITEM_SETUP_DISABLE_SPLASH: - { -#if defined(PCBTARANIS) - lcd_putsLeft(y, STR_SPLASHSCREEN); - if (SPLASH_NEEDED()) { - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, SPLASH_TIMEOUT/100, attr|LEFT); - lcd_putc(lcdLastPos, y, 's'); - } - else { - lcd_putsiAtt(RADIO_SETUP_2ND_COLUMN, y, STR_MMMINV, 0, attr); // TODO define - } - if (attr) g_eeGeneral.splashMode = -checkIncDecGen(event, -g_eeGeneral.splashMode, -3, 4); -#else - uint8_t b = 1-g_eeGeneral.splashMode; - g_eeGeneral.splashMode = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_SPLASHSCREEN, attr, event); -#endif - break; - } -#endif - -#if defined(FRSKY) && defined(FRSKY_HUB) && defined(GPS) - case ITEM_SETUP_TIMEZONE: - lcd_putsLeft(y, STR_TIMEZONE); - lcd_outdezAtt(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_GPSFORMAT: - g_eeGeneral.gpsFormat = selectMenuItem(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: - g_eeGeneral.countryCode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); - break; -#endif - -#if defined(CPUARM) - case ITEM_SETUP_LANGUAGE: - lcd_putsLeft(y, STR_VOICELANG); - lcd_putsAtt(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr); - if (attr) { - currentLanguagePackIdx = checkIncDec(event, currentLanguagePackIdx, 0, DIM(languagePacks)-2, EE_GENERAL); - if (checkIncDec_Ret) { - currentLanguagePack = languagePacks[currentLanguagePackIdx]; - strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2); - } - } - break; - - case ITEM_SETUP_IMPERIAL: - g_eeGeneral.imperial = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event); - break; -#endif - -#if defined(FAI_CHOICE) - case ITEM_SETUP_FAI: - onoffMenuItem(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, PSTR("FAI Mode"), attr, event); - if (attr && checkIncDec_Ret) { - if (g_eeGeneral.fai) - POPUP_WARNING(PSTR("FAI\001mode blocked!")); - else - POPUP_CONFIRMATION(PSTR("FAI mode?")); - } - break; -#endif - -#if defined(MAVLINK) - case ITEM_MAVLINK_BAUD: - g_eeGeneral.mavbaud = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MAVLINK_BAUD_LABEL, STR_MAVLINK_BAUDS, g_eeGeneral.mavbaud, 0, 7, attr, event); - break; -#endif - -#if defined(CPUARM) - case ITEM_SETUP_SWITCHES_DELAY: - lcd_putsLeft(y, STR_SWITCHES_DELAY); - lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT); - lcd_putsAtt(lcdLastPos, y, STR_MS, attr); - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, +15); - break; -#endif - - case ITEM_SETUP_RX_CHANNEL_ORD: - lcd_putsLeft(y, STR_RXCHANNELORD); // RAET->AETR - for (uint8_t i=1; i<=4; i++) { - putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channel_order(i), attr); - } - if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23); - break; - - case ITEM_SETUP_STICK_MODE_LABELS: - lcd_putsLeft(y, NO_INDENT(STR_MODE)); - for (uint8_t i=0; i<4; i++) { - lcd_img((6+4*i)*FW, y, sticks, i, 0); -#if defined(FRSKY_STICKS) - if (g_eeGeneral.stickReverse & (1<0) { - CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3); - } - else if (stickMode != g_eeGeneral.stickMode) { - pausePulses(); - stickMode = g_eeGeneral.stickMode; - checkTHR(); - resumePulses(); - clearKeyEvents(); - } -#if defined(ROTARY_ENCODER_NAVIGATION) - MOVE_CURSOR_FROM_HERE(); -#endif - break; - } - } -} - #if defined(SDCARD) void menuGeneralSdManagerInfo(uint8_t event) { @@ -1360,256 +777,6 @@ void menuGeneralDiagAna(uint8_t event) #endif } -#if defined(PCBTARANIS) -enum menuGeneralHwItems { - ITEM_SETUP_HW_LABEL_STICKS, - ITEM_SETUP_HW_STICK1, - ITEM_SETUP_HW_STICK2, - ITEM_SETUP_HW_STICK3, - ITEM_SETUP_HW_STICK4, - ITEM_SETUP_HW_LABEL_POTS, - ITEM_SETUP_HW_POT1, - ITEM_SETUP_HW_POT2, - CASE_REVPLUS(ITEM_SETUP_HW_POT3) - ITEM_SETUP_HW_LS, - ITEM_SETUP_HW_RS, - ITEM_SETUP_HW_LABEL_SWITCHES, - ITEM_SETUP_HW_SA, - ITEM_SETUP_HW_SB, - ITEM_SETUP_HW_SC, - ITEM_SETUP_HW_SD, - ITEM_SETUP_HW_SE, - ITEM_SETUP_HW_SF, - ITEM_SETUP_HW_SG, - ITEM_SETUP_HW_SH, - ITEM_SETUP_HW_SI, - ITEM_SETUP_HW_SJ, - ITEM_SETUP_HW_SK, - ITEM_SETUP_HW_SL, - ITEM_SETUP_HW_SM, - ITEM_SETUP_HW_SN, - CASE_REV9E(ITEM_SETUP_HW_SO) - CASE_REV9E(ITEM_SETUP_HW_SP) - CASE_REV9E(ITEM_SETUP_HW_SQ) - CASE_REV9E(ITEM_SETUP_HW_SR) - ITEM_SETUP_HW_UART3_MODE, - ITEM_SETUP_HW_MAX -}; - -#define HW_SETTINGS_COLUMN 15*FW - -#if defined(REVPLUS) - #define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0 -#else - #define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0 -#endif - -#if defined(REV9E) - #define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1 -#else - #define SWITCH_ROWS(x) uint8_t(IS_2x2POS(x) ? 0 : HIDDEN_ROW) - #define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, SWITCH_ROWS(0), SWITCH_ROWS(1), SWITCH_ROWS(2), SWITCH_ROWS(3), SWITCH_ROWS(4), SWITCH_ROWS(6) -#endif - -void menuGeneralHardware(uint8_t event) -{ - MENU(STR_HARDWARE, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0}); - - uint8_t sub = m_posVert - 1; - - for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS) : 0); - switch (k) { - case ITEM_SETUP_HW_LABEL_STICKS: - lcd_putsLeft(y, "Sticks"); - break; - case ITEM_SETUP_HW_STICK1: - case ITEM_SETUP_HW_STICK2: - case ITEM_SETUP_HW_STICK3: - case ITEM_SETUP_HW_STICK4: - case ITEM_SETUP_HW_LS: - case ITEM_SETUP_HW_RS: - { - int idx = (k<=ITEM_SETUP_HW_STICK4 ? k-ITEM_SETUP_HW_STICK1 : k-ITEM_SETUP_HW_LS+7); - lcd_putsiAtt(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0); - if (ZEXIST(g_eeGeneral.anaNames[idx]) || attr) - editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, event, attr); - else - lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); - break; - } - case ITEM_SETUP_HW_LABEL_POTS: - lcd_putsLeft(y, "Pots"); - break; - case ITEM_SETUP_HW_POT1: - case ITEM_SETUP_HW_POT2: -#if defined(REVPLUS) - case ITEM_SETUP_HW_POT3: -#endif - { - int idx = k - ITEM_SETUP_HW_POT1; - uint8_t shift = (2*idx); - uint8_t mask = (0x03 << shift); - lcd_putsiAtt(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+idx+1, m_posHorz < 0 ? attr : 0); - if (ZEXIST(g_eeGeneral.anaNames[NUM_STICKS+idx]) || (attr && m_posHorz == 0)) - editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[NUM_STICKS+idx], LEN_ANA_NAME, event, attr && m_posHorz == 0); - else - lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); - - uint8_t potType = (g_eeGeneral.potsType & mask) >> shift; - if (potType == POT_TYPE_NONE && k <= ITEM_SETUP_HW_POT2) - potType = POT_TYPE_DETENT; - potType = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", STR_POTTYPES, potType, 0, POT_TYPE_MAX, m_posHorz == 1 ? attr : 0, event); - if (potType == POT_TYPE_DETENT && k <= ITEM_SETUP_HW_POT2) - potType = POT_TYPE_NONE; - g_eeGeneral.potsType &= ~mask; - g_eeGeneral.potsType |= (potType << shift); - break; - } - case ITEM_SETUP_HW_LABEL_SWITCHES: - lcd_putsLeft(y, "Switches"); - break; - case ITEM_SETUP_HW_SA: - case ITEM_SETUP_HW_SB: - case ITEM_SETUP_HW_SC: - case ITEM_SETUP_HW_SD: - case ITEM_SETUP_HW_SE: - case ITEM_SETUP_HW_SF: - case ITEM_SETUP_HW_SG: - case ITEM_SETUP_HW_SH: - case ITEM_SETUP_HW_SI: - case ITEM_SETUP_HW_SJ: - case ITEM_SETUP_HW_SK: - case ITEM_SETUP_HW_SL: - case ITEM_SETUP_HW_SM: - case ITEM_SETUP_HW_SN: -#if defined(REV9E) - case ITEM_SETUP_HW_SO: - case ITEM_SETUP_HW_SP: - case ITEM_SETUP_HW_SQ: - case ITEM_SETUP_HW_SR: -#endif - { - int index = k-ITEM_SETUP_HW_SA; - char label[] = INDENT "S*"; - label[2] = 'A' + index; - int config = SWITCH_CONFIG(index); - lcd_putsAtt(0, y, label, m_posHorz < 0 ? attr : 0); - if (ZEXIST(g_eeGeneral.switchNames[index]) || (attr && m_posHorz == 0)) - editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.switchNames[index], LEN_SWITCH_NAME, event, m_posHorz == 0 ? attr : 0); - else - lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); -#if defined(REV9E) - config = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", "\007None\0 DefaultToggle\0""2POS\0 3POS\0", config, SWITCH_NONE, SWITCH_3POS, m_posHorz == 1 ? attr : 0, event); - if (attr && checkIncDec_Ret) { - uint32_t mask = 0x0f << (4*index); - TRACE("avant %x", g_eeGeneral.switchConfig); - g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | ((uint32_t(config)&0xf) << (4*index)); - TRACE("apres %x", g_eeGeneral.switchConfig); - } -#else - if (k <= ITEM_SETUP_HW_SH) { - config = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", "\007DefaultToggle\0""2POS\0 3POS\0 2x2POS\0", config, SWITCH_NONE, SWITCH_2x2POS, m_posHorz == 1 ? attr : 0, event); - if (attr && checkIncDec_Ret) { - uint32_t mask = 0x0f << (4*index); - g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | (((uint32_t)(config)&0xf) << (4*index)); - } - } -#endif - break; - } - case ITEM_SETUP_HW_UART3_MODE: - g_eeGeneral.uart3Mode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.uart3Mode, 0, UART_MODE_MAX, attr, event); - if (attr && checkIncDec_Ret) { - uart3Init(g_eeGeneral.uart3Mode, MODEL_TELEMETRY_PROTOCOL()); - } - break; - } - } -} - -#elif defined(PCBSKY9X) - -enum menuGeneralHwItems { - ITEM_SETUP_HW_OPTREX_DISPLAY, - ITEM_SETUP_HW_STICKS_GAINS_LABELS, - ITEM_SETUP_HW_STICK_LV_GAIN, - ITEM_SETUP_HW_STICK_LH_GAIN, - ITEM_SETUP_HW_STICK_RV_GAIN, - ITEM_SETUP_HW_STICK_RH_GAIN, - IF_ROTARY_ENCODERS(ITEM_SETUP_HW_ROTARY_ENCODER) - CASE_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE) - ITEM_SETUP_HW_MAX -}; - -#define GENERAL_HW_PARAM_OFS (2+(15*FW)) -void menuGeneralHardware(uint8_t event) -{ - MENU(STR_HARDWARE, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) CASE_BLUETOOTH(0)}); - - uint8_t sub = m_posVert - 1; - - for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); - uint8_t attr = (sub == k ? blink : 0); - - switch(k) { - case ITEM_SETUP_HW_OPTREX_DISPLAY: - g_eeGeneral.optrexDisplay = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_LCD, STR_VLCD, g_eeGeneral.optrexDisplay, 0, 1, attr, event); - break; - - case ITEM_SETUP_HW_STICKS_GAINS_LABELS: - lcd_putsLeft(y, PSTR("Sticks")); - break; - - case ITEM_SETUP_HW_STICK_LV_GAIN: - case ITEM_SETUP_HW_STICK_LH_GAIN: - case ITEM_SETUP_HW_STICK_RV_GAIN: - case ITEM_SETUP_HW_STICK_RH_GAIN: - { - lcd_putsiAtt(INDENT_WIDTH, y, PSTR("\002LVLHRVRH"), k-ITEM_SETUP_HW_STICK_LV_GAIN, 0); - lcd_puts(INDENT_WIDTH+3*FW, y, PSTR("Gain")); - uint8_t mask = (1<<(k-ITEM_SETUP_HW_STICK_LV_GAIN)); - uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0); - lcd_putcAtt(GENERAL_HW_PARAM_OFS, y, val ? '2' : '1', attr); - if (attr) { - CHECK_INCDEC_GENVAR(event, val, 0, 1); - if (checkIncDec_Ret) { - g_eeGeneral.sticksGain ^= mask; - setSticksGain(g_eeGeneral.sticksGain); - } - } - break; - } - -#if defined(ROTARY_ENCODERS) - case ITEM_SETUP_HW_ROTARY_ENCODER: - g_eeGeneral.rotarySteps = selectMenuItem(GENERAL_HW_PARAM_OFS, y, PSTR("Rotary Encoder"), PSTR("\0062steps4steps"), g_eeGeneral.rotarySteps, 0, 1, attr, event); - break; -#endif - -#if defined(BLUETOOTH) - case ITEM_SETUP_HW_BT_BAUDRATE: - g_eeGeneral.btBaudrate = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_BAUDRATE, PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event); - if (attr && checkIncDec_Ret) { - btInit(); - } - break; -#endif - - } - } -} -#endif - #define XPOT_DELTA 10 #define XPOT_DELAY 10 /* cycles */ diff --git a/radio/src/gui/menu_general_hardware.cpp b/radio/src/gui/menu_general_hardware.cpp new file mode 100755 index 000000000..888013e51 --- /dev/null +++ b/radio/src/gui/menu_general_hardware.cpp @@ -0,0 +1,287 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "../opentx.h" + +#if defined(PCBTARANIS) +enum menuGeneralHwItems { + ITEM_SETUP_HW_LABEL_STICKS, + ITEM_SETUP_HW_STICK1, + ITEM_SETUP_HW_STICK2, + ITEM_SETUP_HW_STICK3, + ITEM_SETUP_HW_STICK4, + ITEM_SETUP_HW_LABEL_POTS, + ITEM_SETUP_HW_POT1, + ITEM_SETUP_HW_POT2, + CASE_REVPLUS(ITEM_SETUP_HW_POT3) + ITEM_SETUP_HW_LS, + ITEM_SETUP_HW_RS, + ITEM_SETUP_HW_LABEL_SWITCHES, + ITEM_SETUP_HW_SA, + ITEM_SETUP_HW_SB, + ITEM_SETUP_HW_SC, + ITEM_SETUP_HW_SD, + ITEM_SETUP_HW_SE, + ITEM_SETUP_HW_SF, + ITEM_SETUP_HW_SG, + ITEM_SETUP_HW_SH, + ITEM_SETUP_HW_SI, + ITEM_SETUP_HW_SJ, + ITEM_SETUP_HW_SK, + ITEM_SETUP_HW_SL, + ITEM_SETUP_HW_SM, + ITEM_SETUP_HW_SN, + CASE_REV9E(ITEM_SETUP_HW_SO) + CASE_REV9E(ITEM_SETUP_HW_SP) + CASE_REV9E(ITEM_SETUP_HW_SQ) + CASE_REV9E(ITEM_SETUP_HW_SR) + ITEM_SETUP_HW_UART3_MODE, + ITEM_SETUP_HW_MAX +}; + +#define HW_SETTINGS_COLUMN 15*FW + +#if defined(REVPLUS) + #define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0 +#else + #define POTS_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, 0, 0 +#endif + +#if defined(REV9E) + #define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1 +#else + #define SWITCH_ROWS(x) uint8_t(IS_2x2POS(x) ? 0 : HIDDEN_ROW) + #define SWITCHES_ROWS NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, NAVIGATION_LINE_BY_LINE|1, SWITCH_ROWS(0), SWITCH_ROWS(1), SWITCH_ROWS(2), SWITCH_ROWS(3), SWITCH_ROWS(4), SWITCH_ROWS(6) +#endif + +void menuGeneralHardware(uint8_t event) +{ + MENU(STR_HARDWARE, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0}); + + uint8_t sub = m_posVert - 1; + + for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS) : 0); + switch (k) { + case ITEM_SETUP_HW_LABEL_STICKS: + lcd_putsLeft(y, "Sticks"); + break; + case ITEM_SETUP_HW_STICK1: + case ITEM_SETUP_HW_STICK2: + case ITEM_SETUP_HW_STICK3: + case ITEM_SETUP_HW_STICK4: + case ITEM_SETUP_HW_LS: + case ITEM_SETUP_HW_RS: + { + int idx = (k<=ITEM_SETUP_HW_STICK4 ? k-ITEM_SETUP_HW_STICK1 : k-ITEM_SETUP_HW_LS+7); + lcd_putsiAtt(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0); + if (ZEXIST(g_eeGeneral.anaNames[idx]) || attr) + editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[idx], LEN_ANA_NAME, event, attr); + else + lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); + break; + } + case ITEM_SETUP_HW_LABEL_POTS: + lcd_putsLeft(y, "Pots"); + break; + case ITEM_SETUP_HW_POT1: + case ITEM_SETUP_HW_POT2: +#if defined(REVPLUS) + case ITEM_SETUP_HW_POT3: +#endif + { + int idx = k - ITEM_SETUP_HW_POT1; + uint8_t shift = (2*idx); + uint8_t mask = (0x03 << shift); + lcd_putsiAtt(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+idx+1, m_posHorz < 0 ? attr : 0); + if (ZEXIST(g_eeGeneral.anaNames[NUM_STICKS+idx]) || (attr && m_posHorz == 0)) + editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[NUM_STICKS+idx], LEN_ANA_NAME, event, attr && m_posHorz == 0); + else + lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); + + uint8_t potType = (g_eeGeneral.potsType & mask) >> shift; + if (potType == POT_TYPE_NONE && k <= ITEM_SETUP_HW_POT2) + potType = POT_TYPE_DETENT; + potType = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", STR_POTTYPES, potType, 0, POT_TYPE_MAX, m_posHorz == 1 ? attr : 0, event); + if (potType == POT_TYPE_DETENT && k <= ITEM_SETUP_HW_POT2) + potType = POT_TYPE_NONE; + g_eeGeneral.potsType &= ~mask; + g_eeGeneral.potsType |= (potType << shift); + break; + } + case ITEM_SETUP_HW_LABEL_SWITCHES: + lcd_putsLeft(y, "Switches"); + break; + case ITEM_SETUP_HW_SA: + case ITEM_SETUP_HW_SB: + case ITEM_SETUP_HW_SC: + case ITEM_SETUP_HW_SD: + case ITEM_SETUP_HW_SE: + case ITEM_SETUP_HW_SF: + case ITEM_SETUP_HW_SG: + case ITEM_SETUP_HW_SH: + case ITEM_SETUP_HW_SI: + case ITEM_SETUP_HW_SJ: + case ITEM_SETUP_HW_SK: + case ITEM_SETUP_HW_SL: + case ITEM_SETUP_HW_SM: + case ITEM_SETUP_HW_SN: +#if defined(REV9E) + case ITEM_SETUP_HW_SO: + case ITEM_SETUP_HW_SP: + case ITEM_SETUP_HW_SQ: + case ITEM_SETUP_HW_SR: +#endif + { + int index = k-ITEM_SETUP_HW_SA; + char label[] = INDENT "S*"; + label[2] = 'A' + index; + int config = SWITCH_CONFIG(index); + lcd_putsAtt(0, y, label, m_posHorz < 0 ? attr : 0); + if (ZEXIST(g_eeGeneral.switchNames[index]) || (attr && m_posHorz == 0)) + editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.switchNames[index], LEN_SWITCH_NAME, event, m_posHorz == 0 ? attr : 0); + else + lcd_putsiAtt(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); +#if defined(REV9E) + config = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", "\007None\0 DefaultToggle\0""2POS\0 3POS\0", config, SWITCH_NONE, SWITCH_3POS, m_posHorz == 1 ? attr : 0, event); + if (attr && checkIncDec_Ret) { + uint32_t mask = 0x0f << (4*index); + TRACE("avant %x", g_eeGeneral.switchConfig); + g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | ((uint32_t(config)&0xf) << (4*index)); + TRACE("apres %x", g_eeGeneral.switchConfig); + } +#else + if (k <= ITEM_SETUP_HW_SH) { + config = selectMenuItem(HW_SETTINGS_COLUMN+5*FW, y, "", "\007DefaultToggle\0""2POS\0 3POS\0 2x2POS\0", config, SWITCH_NONE, SWITCH_2x2POS, m_posHorz == 1 ? attr : 0, event); + if (attr && checkIncDec_Ret) { + uint32_t mask = 0x0f << (4*index); + g_eeGeneral.switchConfig = (g_eeGeneral.switchConfig & ~mask) | (((uint32_t)(config)&0xf) << (4*index)); + } + } +#endif + break; + } + case ITEM_SETUP_HW_UART3_MODE: + g_eeGeneral.uart3Mode = selectMenuItem(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.uart3Mode, 0, UART_MODE_MAX, attr, event); + if (attr && checkIncDec_Ret) { + uart3Init(g_eeGeneral.uart3Mode, MODEL_TELEMETRY_PROTOCOL()); + } + break; + } + } +} + +#elif defined(PCBSKY9X) + +enum menuGeneralHwItems { + ITEM_SETUP_HW_OPTREX_DISPLAY, + ITEM_SETUP_HW_STICKS_GAINS_LABELS, + ITEM_SETUP_HW_STICK_LV_GAIN, + ITEM_SETUP_HW_STICK_LH_GAIN, + ITEM_SETUP_HW_STICK_RV_GAIN, + ITEM_SETUP_HW_STICK_RH_GAIN, + IF_ROTARY_ENCODERS(ITEM_SETUP_HW_ROTARY_ENCODER) + CASE_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE) + ITEM_SETUP_HW_MAX +}; + +#define GENERAL_HW_PARAM_OFS (2+(15*FW)) +void menuGeneralHardware(uint8_t event) +{ + MENU(STR_HARDWARE, menuTabGeneral, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) CASE_BLUETOOTH(0)}); + + uint8_t sub = m_posVert - 1; + + for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); + uint8_t attr = (sub == k ? blink : 0); + + switch(k) { + case ITEM_SETUP_HW_OPTREX_DISPLAY: + g_eeGeneral.optrexDisplay = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_LCD, STR_VLCD, g_eeGeneral.optrexDisplay, 0, 1, attr, event); + break; + + case ITEM_SETUP_HW_STICKS_GAINS_LABELS: + lcd_putsLeft(y, PSTR("Sticks")); + break; + + case ITEM_SETUP_HW_STICK_LV_GAIN: + case ITEM_SETUP_HW_STICK_LH_GAIN: + case ITEM_SETUP_HW_STICK_RV_GAIN: + case ITEM_SETUP_HW_STICK_RH_GAIN: + { + lcd_putsiAtt(INDENT_WIDTH, y, PSTR("\002LVLHRVRH"), k-ITEM_SETUP_HW_STICK_LV_GAIN, 0); + lcd_puts(INDENT_WIDTH+3*FW, y, PSTR("Gain")); + uint8_t mask = (1<<(k-ITEM_SETUP_HW_STICK_LV_GAIN)); + uint8_t val = (g_eeGeneral.sticksGain & mask ? 1 : 0); + lcd_putcAtt(GENERAL_HW_PARAM_OFS, y, val ? '2' : '1', attr); + if (attr) { + CHECK_INCDEC_GENVAR(event, val, 0, 1); + if (checkIncDec_Ret) { + g_eeGeneral.sticksGain ^= mask; + setSticksGain(g_eeGeneral.sticksGain); + } + } + break; + } + +#if defined(ROTARY_ENCODERS) + case ITEM_SETUP_HW_ROTARY_ENCODER: + g_eeGeneral.rotarySteps = selectMenuItem(GENERAL_HW_PARAM_OFS, y, PSTR("Rotary Encoder"), PSTR("\0062steps4steps"), g_eeGeneral.rotarySteps, 0, 1, attr, event); + break; +#endif + +#if defined(BLUETOOTH) + case ITEM_SETUP_HW_BT_BAUDRATE: + g_eeGeneral.btBaudrate = selectMenuItem(GENERAL_HW_PARAM_OFS, y, STR_BAUDRATE, PSTR("\005115k 9600 19200"), g_eeGeneral.btBaudrate, 0, 2, attr, event); + if (attr && checkIncDec_Ret) { + btInit(); + } + break; +#endif + + } + } +} +#endif diff --git a/radio/src/gui/menu_general_setup.cpp b/radio/src/gui/menu_general_setup.cpp new file mode 100755 index 000000000..3a101fcb6 --- /dev/null +++ b/radio/src/gui/menu_general_setup.cpp @@ -0,0 +1,620 @@ +/* + * Authors (alphabetical order) + * - Andre Bernet + * - Andreas Weitl + * - Bertrand Songis + * - Bryan J. Rentoul (Gruvin) + * - Cameron Weeks + * - Erez Raviv + * - Gabriel Birkus + * - Jean-Pierre Parisy + * - Karl Szmutny + * - Michael Blandford + * - Michal Hlavinka + * - Pat Mackenzie + * - Philip Moss + * - Rob Thomson + * - Romolo Manfredini + * - Thomas Husterer + * + * opentx is based on code named + * gruvin9x by Bryan J. Rentoul: http://code.google.com/p/gruvin9x/, + * er9x by Erez Raviv: http://code.google.com/p/er9x/, + * and the original (and ongoing) project by + * Thomas Husterer, th9x: http://code.google.com/p/th9x/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include "../opentx.h" + +#if LCD_W >= 212 + #define RADIO_SETUP_2ND_COLUMN (LCD_W-10*FW-MENUS_SCROLLBAR_WIDTH) + #define RADIO_SETUP_DATE_COLUMN RADIO_SETUP_2ND_COLUMN + 4*FWNUM + #define RADIO_SETUP_TIME_COLUMN RADIO_SETUP_2ND_COLUMN + 2*FWNUM +#else + #define RADIO_SETUP_2ND_COLUMN (LCD_W-6*FW-3-MENUS_SCROLLBAR_WIDTH) + #define RADIO_SETUP_TIME_COLUMN (FW*15+9) + #define RADIO_SETUP_DATE_COLUMN (FW*15+7) +#endif + +#if !defined(CPUM64) + #define SLIDER_5POS(y, value, label, event, attr) { \ + int8_t tmp = value; \ + displaySlider(RADIO_SETUP_2ND_COLUMN, y, 2+tmp, 4, attr); \ + value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ + } +#elif defined(GRAPHICS) + #define SLIDER_5POS(y, value, label, event, attr) { \ + int8_t tmp = value; \ + display5posSlider(RADIO_SETUP_2ND_COLUMN, y, tmp, attr); \ + value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, NULL, tmp, -2, +2, attr, event); \ + } +#else + #define SLIDER_5POS(y, value, label, event, attr) value = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, label, STR_VBEEPLEN, value, -2, +2, attr, event) +#endif + +#if defined(SPLASH) && !defined(FSPLASH) + #define CASE_SPLASH_PARAM(x) x, +#else + #define CASE_SPLASH_PARAM(x) +#endif + +enum menuGeneralSetupItems { + 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) + CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME) + CASE_CPUARM(ITEM_SETUP_BEEP_VOLUME) + ITEM_SETUP_BEEP_LENGTH, + CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH) + CASE_CPUARM(ITEM_SETUP_WAV_VOLUME) + CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) + CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) + CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) + CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) + CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE) + CASE_VARIO_CPUARM(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) + ITEM_SETUP_CONTRAST, + ITEM_SETUP_ALARMS_LABEL, + ITEM_SETUP_BATTERY_WARNING, + CASE_PCBSKY9X(ITEM_SETUP_CAPACITY_WARNING) + CASE_PCBSKY9X(ITEM_SETUP_TEMPERATURE_WARNING) + ITEM_SETUP_INACTIVITY_ALARM, + ITEM_SETUP_MEMORY_WARNING, + ITEM_SETUP_ALARM_WARNING, + IF_ROTARY_ENCODERS(ITEM_SETUP_RE_NAVIGATION) + ITEM_SETUP_BACKLIGHT_LABEL, + ITEM_SETUP_BACKLIGHT_MODE, + ITEM_SETUP_BACKLIGHT_DELAY, + CASE_CPUARM(ITEM_SETUP_BRIGHTNESS) + CASE_REVPLUS(ITEM_SETUP_BACKLIGHT_COLOR) + 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) + CASE_GPS(ITEM_SETUP_TIMEZONE) + CASE_GPS(ITEM_SETUP_GPSFORMAT) + CASE_PXX(ITEM_SETUP_COUNTRYCODE) + CASE_CPUARM(ITEM_SETUP_LANGUAGE) + CASE_CPUARM(ITEM_SETUP_IMPERIAL) + IF_FAI_CHOICE(ITEM_SETUP_FAI) + CASE_MAVLINK(ITEM_MAVLINK_BAUD) + CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY) + ITEM_SETUP_RX_CHANNEL_ORD, + ITEM_SETUP_STICK_MODE_LABELS, + ITEM_SETUP_STICK_MODE, + ITEM_SETUP_MAX +}; + +#if defined(FRSKY_STICKS) + #define COL_TX_MODE 0 +#else + #define COL_TX_MODE LABEL(TX_MODE) +#endif + +void menuGeneralSetup(uint8_t event) +{ +#if defined(RTCLOCK) + struct gtm t; + gettime(&t); + + if ((m_posVert==ITEM_SETUP_DATE+1 || m_posVert==ITEM_SETUP_TIME+1) && + (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 + rtcSetTime(&t); + } +#endif + +#if defined(FAI_CHOICE) + if (s_warning_result) { + s_warning_result = 0; + g_eeGeneral.fai = true; + eeDirty(EE_GENERAL); + } +#endif + + MENU(STR_MENURADIOSETUP, menuTabGeneral, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/}); + + uint8_t sub = m_posVert - 1; + + for (uint8_t i=0; i0) ? BLINK|INVERS : INVERS); + uint8_t attr = (sub == k ? blink : 0); + + switch(k) { +#if defined(RTCLOCK) + case ITEM_SETUP_DATE: + lcd_putsLeft(y, STR_DATE); + lcd_putc(RADIO_SETUP_DATE_COLUMN, y, '-'); lcd_putc(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, '-'); + for (uint8_t j=0; j<3; j++) { + uint8_t rowattr = (m_posHorz==j ? attr : 0); + switch (j) { + case 0: + lcd_outdezAtt(RADIO_SETUP_DATE_COLUMN, y, t.tm_year+1900, rowattr); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_year = checkIncDec(event, t.tm_year, 112, 200, 0); + break; + case 1: + lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+3*FW-2, y, t.tm_mon+1, rowattr|LEADING0, 2); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mon = checkIncDec(event, t.tm_mon, 0, 11, 0); + break; + case 2: + { + int16_t year = 1900 + t.tm_year; + int8_t dlim = (((((year%4==0) && (year%100!=0)) || (year%400==0)) && (t.tm_mon==1)) ? 1 : 0); + static const pm_uint8_t dmon[] PROGMEM = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + dlim += pgm_read_byte(&dmon[t.tm_mon]); + lcd_outdezNAtt(RADIO_SETUP_DATE_COLUMN+6*FW-4, y, t.tm_mday, rowattr|LEADING0, 2); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_mday = checkIncDec(event, t.tm_mday, 1, dlim, 0); + break; + } + } + } +#if defined(PCBTARANIS) + if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); +#endif + if (attr && checkIncDec_Ret) { + g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated + } + break; + + case ITEM_SETUP_TIME: + lcd_putsLeft(y, STR_TIME); + lcd_putc(RADIO_SETUP_TIME_COLUMN+1, y, ':'); lcd_putc(RADIO_SETUP_TIME_COLUMN+3*FW-2, y, ':'); + for (uint8_t j=0; j<3; j++) { + uint8_t rowattr = (m_posHorz==j ? attr : 0); + switch (j) { + case 0: + lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN, y, t.tm_hour, rowattr|LEADING0, 2); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_hour = checkIncDec(event, t.tm_hour, 0, 23, 0); + break; + case 1: + lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+3*FWNUM, y, t.tm_min, rowattr|LEADING0, 2); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_min = checkIncDec(event, t.tm_min, 0, 59, 0); + break; + case 2: + lcd_outdezNAtt(RADIO_SETUP_TIME_COLUMN+6*FWNUM, y, t.tm_sec, rowattr|LEADING0, 2); + if (rowattr && (s_editMode>0 || p1valdiff)) t.tm_sec = checkIncDec(event, t.tm_sec, 0, 59, 0); + break; + } + } +#if defined(PCBTARANIS) + if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); +#endif + if (attr && checkIncDec_Ret) + g_rtcTime = gmktime(&t); // update local timestamp and get wday calculated + break; +#endif + +#if defined(BATTGRAPH) || defined(PCBTARANIS) + case ITEM_SETUP_BATT_RANGE: + lcd_putsLeft(y, STR_BATTERY_RANGE); + putsVolts(RADIO_SETUP_2ND_COLUMN, y, 90+g_eeGeneral.vBatMin, (m_posHorz==0 ? attr : 0)|LEFT|NO_UNIT); + lcd_putc(lcdLastPos, y, '-'); + putsVolts(lcdLastPos+FW, y, 120+g_eeGeneral.vBatMax, (m_posHorz>0 ? attr : 0)|LEFT|NO_UNIT); +#if defined(PCBTARANIS) + if (attr && m_posHorz < 0) lcd_filled_rect(RADIO_SETUP_2ND_COLUMN, y, LCD_W-RADIO_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8); +#endif + if (attr && s_editMode>0) { + if (m_posHorz==0) + CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMin, -50, g_eeGeneral.vBatMax+29); // min=4.0V + else + CHECK_INCDEC_GENVAR(event, g_eeGeneral.vBatMax, g_eeGeneral.vBatMin-29, +40); // max=16.0V + } + break; +#endif + + case ITEM_SETUP_SOUND_LABEL: + lcd_putsLeft(y, STR_SOUND_LABEL); + break; + +#if defined(AUDIO) + case ITEM_SETUP_BEEP_MODE: + g_eeGeneral.beepMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); +#if defined(FRSKY) + if (attr && checkIncDec_Ret) frskySendAlarms(); +#endif + break; + +#if defined(BUZZER) + case ITEM_SETUP_BUZZER_MODE: + g_eeGeneral.buzzerMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_BUZZER, STR_VBEEPMODE, g_eeGeneral.buzzerMode, -2, 1, attr, event); +#if defined(FRSKY) + if (attr && checkIncDec_Ret) frskySendAlarms(); +#endif + break; +#endif +#else + case ITEM_SETUP_BUZZER_MODE: + g_eeGeneral.beepMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_SPEAKER, STR_VBEEPMODE, g_eeGeneral.beepMode, -2, 1, attr, event); +#if defined(FRSKY) + if (attr && checkIncDec_Ret) frskySendAlarms(); +#endif + break; +#endif + +#if defined(VOICE) + case ITEM_SETUP_SPEAKER_VOLUME: + { + lcd_putsLeft(y, STR_SPEAKER_VOLUME); + uint8_t b = g_eeGeneral.speakerVolume+VOLUME_LEVEL_DEF; + displaySlider(RADIO_SETUP_2ND_COLUMN, y, b, VOLUME_LEVEL_MAX, attr); + if (attr) { + CHECK_INCDEC_GENVAR(event, b, 0, VOLUME_LEVEL_MAX); + if (checkIncDec_Ret) { + g_eeGeneral.speakerVolume = (int8_t)b-VOLUME_LEVEL_DEF; +#if !defined(CPUARM) + setVolume(b); +#endif + } + } + break; + } +#endif + +#if defined(CPUARM) + case ITEM_SETUP_BEEP_VOLUME: + SLIDER_5POS(y, g_eeGeneral.beepVolume, STR_BEEP_VOLUME, event, attr); + break; + case ITEM_SETUP_WAV_VOLUME: + SLIDER_5POS(y, g_eeGeneral.wavVolume, STR_WAV_VOLUME, event, attr); + break; + case ITEM_SETUP_BACKGROUND_VOLUME: + SLIDER_5POS(y, g_eeGeneral.backgroundVolume, STR_BG_VOLUME, event, attr); + break; +#endif + + case ITEM_SETUP_BEEP_LENGTH: + SLIDER_5POS(y, g_eeGeneral.beepLength, STR_BEEP_LENGTH, event, attr); + break; + +#if defined(AUDIO) + case ITEM_SETUP_SPEAKER_PITCH: + lcd_putsLeft( y, STR_SPKRPITCH); +#if defined(CPUARM) + lcd_putcAtt(RADIO_SETUP_2ND_COLUMN, y, '+', attr); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN+FW, y, g_eeGeneral.speakerPitch*15, attr|LEFT); + lcd_putsAtt(lcdLastPos, y, "Hz", attr); +#else + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.speakerPitch, attr|LEFT); +#endif + if (attr) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.speakerPitch, 0, 20); + } + break; +#endif + +#if defined(CPUARM) && defined(VARIO) + case ITEM_SETUP_VARIO_LABEL: + lcd_putsLeft(y, STR_VARIO); + break; + case ITEM_SETUP_VARIO_VOLUME: + SLIDER_5POS(y, g_eeGeneral.varioVolume, TR_SPEAKER_VOLUME, event, attr); + break; + case ITEM_SETUP_VARIO_PITCH: + lcd_putsLeft(y, STR_PITCH_AT_ZERO); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10), attr|LEFT); + lcd_putsAtt(lcdLastPos, y, "Hz", attr); + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioPitch, -40, 40); + break; + case ITEM_SETUP_VARIO_RANGE: + lcd_putsLeft(y, STR_PITCH_AT_MAX); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_FREQUENCY_ZERO+(g_eeGeneral.varioPitch*10)+VARIO_FREQUENCY_RANGE+(g_eeGeneral.varioRange*10), attr|LEFT); + lcd_putsAtt(lcdLastPos, y, "Hz", attr); + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRange, -80, 80); + break; + case ITEM_SETUP_VARIO_REPEAT: + lcd_putsLeft(y, STR_REPEAT_AT_ZERO); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT); + lcd_putsAtt(lcdLastPos, y, STR_MS, attr); + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50); + break; +#endif + +#if defined(HAPTIC) + case ITEM_SETUP_HAPTIC_LABEL: + lcd_putsLeft(y, STR_HAPTIC_LABEL); + break; + + case ITEM_SETUP_HAPTIC_MODE: + g_eeGeneral.hapticMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBEEPMODE, g_eeGeneral.hapticMode, -2, 1, attr, event); + break; + + case ITEM_SETUP_HAPTIC_LENGTH: + SLIDER_5POS(y, g_eeGeneral.hapticLength, STR_LENGTH, event, attr); + break; + + case ITEM_SETUP_HAPTIC_STRENGTH: + SLIDER_5POS(y, g_eeGeneral.hapticStrength, STR_HAPTICSTRENGTH, event, attr); + break; +#endif + + case ITEM_SETUP_CONTRAST: + lcd_putsLeft(y, STR_CONTRAST); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.contrast, attr|LEFT); + if (attr) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.contrast, CONTRAST_MIN, CONTRAST_MAX); + lcdSetContrast(); + } + break; + + case ITEM_SETUP_ALARMS_LABEL: + lcd_putsLeft(y, STR_ALARMS_LABEL); + break; + + case ITEM_SETUP_BATTERY_WARNING: + lcd_putsLeft(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: + { + uint8_t b = 1-g_eeGeneral.disableMemoryWarning; + g_eeGeneral.disableMemoryWarning = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_MEMORYWARNING, attr, event); + break; + } + + case ITEM_SETUP_ALARM_WARNING: + { + uint8_t b = 1-g_eeGeneral.disableAlarmWarning; + g_eeGeneral.disableAlarmWarning = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_ALARMWARNING, attr, event); + break; + } + +#if defined(PCBSKY9X) + case ITEM_SETUP_CAPACITY_WARNING: + lcd_putsLeft(y, STR_CAPAWARNING); + putsValueWithUnit(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 + +#if defined(PCBSKY9X) + case ITEM_SETUP_TEMPERATURE_WARNING: + lcd_putsLeft(y, STR_TEMPWARNING); + putsValueWithUnit(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.temperatureWarn, UNIT_TEMPERATURE, attr|LEFT) ; + if(attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.temperatureWarn, 0, 120); // 0 means no alarm + break; +#endif + + case ITEM_SETUP_INACTIVITY_ALARM: + lcd_putsLeft( y,STR_INACTIVITYALARM); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT); + lcd_putc(lcdLastPos, y, 'm'); + if(attr) g_eeGeneral.inactivityTimer = checkIncDec(event, g_eeGeneral.inactivityTimer, 0, 250, EE_GENERAL); //0..250minutes + break; + +#if ROTARY_ENCODERS > 0 + case ITEM_SETUP_RE_NAVIGATION: + g_eeGeneral.reNavigation = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_RENAVIG, STR_VRENAVIG, g_eeGeneral.reNavigation, 0, NUM_ROTARY_ENCODERS, attr, event); + if (attr && checkIncDec_Ret) { + g_rotenc[NAVIGATION_RE_IDX()] = 0; + } + break; +#endif + + case ITEM_SETUP_BACKLIGHT_LABEL: + lcd_putsLeft(y, STR_BACKLIGHT_LABEL); + break; + + case ITEM_SETUP_BACKLIGHT_MODE: + g_eeGeneral.backlightMode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MODE, STR_VBLMODE, g_eeGeneral.backlightMode, e_backlight_mode_off, e_backlight_mode_on, attr, event); + break; + + case ITEM_SETUP_FLASH_BEEP: + g_eeGeneral.alarmsFlash = onoffMenuItem(g_eeGeneral.alarmsFlash, RADIO_SETUP_2ND_COLUMN, y, STR_ALARM, attr, event ) ; + break; + + case ITEM_SETUP_BACKLIGHT_DELAY: + lcd_putsLeft(y, STR_BLDELAY); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.lightAutoOff*5, attr|LEFT); + lcd_putc(lcdLastPos, y, 's'); + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.lightAutoOff, 0, 600/5); + break; + +#if defined(CPUARM) + case ITEM_SETUP_BRIGHTNESS: + lcd_putsLeft(y, STR_BRIGHTNESS); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 100-g_eeGeneral.backlightBright, attr|LEFT) ; + if (attr) { + uint8_t b = 100 - g_eeGeneral.backlightBright; + CHECK_INCDEC_GENVAR(event, b, 0, 100); + g_eeGeneral.backlightBright = 100 - b; + } + break; +#endif + +#if defined(PCBTARANIS) && defined(REVPLUS) + case ITEM_SETUP_BACKLIGHT_COLOR: + lcd_putsLeft(y, STR_BLCOLOR); + displaySlider(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; +#endif + +#if defined(PWM_BACKLIGHT) + case ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF: + lcd_putsLeft(y, STR_BLOFFBRIGHTNESS); + lcd_outdezAtt(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: + lcd_putsLeft(y, STR_BLONBRIGHTNESS); + lcd_outdezAtt(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); + break; +#endif + +#if defined(SPLASH) && !defined(FSPLASH) + case ITEM_SETUP_DISABLE_SPLASH: + { +#if defined(PCBTARANIS) + lcd_putsLeft(y, STR_SPLASHSCREEN); + if (SPLASH_NEEDED()) { + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, SPLASH_TIMEOUT/100, attr|LEFT); + lcd_putc(lcdLastPos, y, 's'); + } + else { + lcd_putsiAtt(RADIO_SETUP_2ND_COLUMN, y, STR_MMMINV, 0, attr); // TODO define + } + if (attr) g_eeGeneral.splashMode = -checkIncDecGen(event, -g_eeGeneral.splashMode, -3, 4); +#else + uint8_t b = 1-g_eeGeneral.splashMode; + g_eeGeneral.splashMode = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_SPLASHSCREEN, attr, event); +#endif + break; + } +#endif + +#if defined(FRSKY) && defined(FRSKY_HUB) && defined(GPS) + case ITEM_SETUP_TIMEZONE: + lcd_putsLeft(y, STR_TIMEZONE); + lcd_outdezAtt(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_GPSFORMAT: + g_eeGeneral.gpsFormat = selectMenuItem(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: + g_eeGeneral.countryCode = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_COUNTRYCODE, STR_COUNTRYCODES, g_eeGeneral.countryCode, 0, 2, attr, event); + break; +#endif + +#if defined(CPUARM) + case ITEM_SETUP_LANGUAGE: + lcd_putsLeft(y, STR_VOICELANG); + lcd_putsAtt(RADIO_SETUP_2ND_COLUMN, y, currentLanguagePack->name, attr); + if (attr) { + currentLanguagePackIdx = checkIncDec(event, currentLanguagePackIdx, 0, DIM(languagePacks)-2, EE_GENERAL); + if (checkIncDec_Ret) { + currentLanguagePack = languagePacks[currentLanguagePackIdx]; + strncpy(g_eeGeneral.ttsLanguage, currentLanguagePack->id, 2); + } + } + break; + + case ITEM_SETUP_IMPERIAL: + g_eeGeneral.imperial = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_UNITSSYSTEM, STR_VUNITSSYSTEM, g_eeGeneral.imperial, 0, 1, attr, event); + break; +#endif + +#if defined(FAI_CHOICE) + case ITEM_SETUP_FAI: + onoffMenuItem(g_eeGeneral.fai, RADIO_SETUP_2ND_COLUMN, y, PSTR("FAI Mode"), attr, event); + if (attr && checkIncDec_Ret) { + if (g_eeGeneral.fai) + POPUP_WARNING(PSTR("FAI\001mode blocked!")); + else + POPUP_CONFIRMATION(PSTR("FAI mode?")); + } + break; +#endif + +#if defined(MAVLINK) + case ITEM_MAVLINK_BAUD: + g_eeGeneral.mavbaud = selectMenuItem(RADIO_SETUP_2ND_COLUMN, y, STR_MAVLINK_BAUD_LABEL, STR_MAVLINK_BAUDS, g_eeGeneral.mavbaud, 0, 7, attr, event); + break; +#endif + +#if defined(CPUARM) + case ITEM_SETUP_SWITCHES_DELAY: + lcd_putsLeft(y, STR_SWITCHES_DELAY); + lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT); + lcd_putsAtt(lcdLastPos, y, STR_MS, attr); + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, +15); + break; +#endif + + case ITEM_SETUP_RX_CHANNEL_ORD: + lcd_putsLeft(y, STR_RXCHANNELORD); // RAET->AETR + for (uint8_t i=1; i<=4; i++) { + putsChnLetter(RADIO_SETUP_2ND_COLUMN - FW + i*FW, y, channel_order(i), attr); + } + if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.templateSetup, 0, 23); + break; + + case ITEM_SETUP_STICK_MODE_LABELS: + lcd_putsLeft(y, NO_INDENT(STR_MODE)); + for (uint8_t i=0; i<4; i++) { + lcd_img((6+4*i)*FW, y, sticks, i, 0); +#if defined(FRSKY_STICKS) + if (g_eeGeneral.stickReverse & (1<0) { + CHECK_INCDEC_GENVAR(event, g_eeGeneral.stickMode, 0, 3); + } + else if (stickMode != g_eeGeneral.stickMode) { + pausePulses(); + stickMode = g_eeGeneral.stickMode; + checkTHR(); + resumePulses(); + clearKeyEvents(); + } +#if defined(ROTARY_ENCODER_NAVIGATION) + MOVE_CURSOR_FROM_HERE(); +#endif + break; + } + } +} diff --git a/radio/src/gui/menu_model.cpp b/radio/src/gui/menu_model.cpp index da3bb94df..e5f80d594 100644 --- a/radio/src/gui/menu_model.cpp +++ b/radio/src/gui/menu_model.cpp @@ -263,5 +263,3 @@ void editSingleName(coord_t x, coord_t y, const pm_char *label, char *name, uint #endif static uint8_t s_currIdx; - -