From 9d7628e2bd99bdb38dafff4b0e191200028aaef0 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 16 Mar 2019 10:16:55 +0100 Subject: [PATCH] Move analogs and switches debugs for main RADIO menu --- radio/src/gui/128x64/menus.h | 8 +------- radio/src/gui/128x64/radio_calibration.cpp | 2 +- radio/src/gui/128x64/radio_diaganas.cpp | 2 +- radio/src/gui/128x64/radio_diagkeys.cpp | 2 +- radio/src/gui/128x64/radio_hardware.cpp | 19 ++++++++++++++++++- radio/src/translations.cpp | 4 ++++ radio/src/translations.h | 4 ++++ radio/src/translations/cz.h.txt | 4 ++++ radio/src/translations/de.h.txt | 4 ++++ radio/src/translations/en.h.txt | 4 ++++ radio/src/translations/es.h.txt | 4 ++++ radio/src/translations/fi.h.txt | 4 ++++ radio/src/translations/fr.h.txt | 4 ++++ radio/src/translations/it.h.txt | 4 ++++ radio/src/translations/nl.h.txt | 4 ++++ radio/src/translations/pl.h.txt | 4 ++++ radio/src/translations/pt.h.txt | 4 ++++ radio/src/translations/se.h.txt | 4 ++++ 18 files changed, 74 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/128x64/menus.h b/radio/src/gui/128x64/menus.h index 2a0a565d6..ee5c9e552 100644 --- a/radio/src/gui/128x64/menus.h +++ b/radio/src/gui/128x64/menus.h @@ -76,10 +76,7 @@ enum MenuRadioIndexes MENU_RADIO_SPECIAL_FUNCTIONS, MENU_RADIO_TRAINER, MENU_RADIO_VERSION, - MENU_RADIO_SWITCHES_TEST, - MENU_RADIO_ANALOGS_TEST, MENU_RADIO_HARDWARE, - MENU_RADIO_CALIBRATION, MENU_RADIO_PAGES_COUNT }; @@ -99,10 +96,7 @@ static const MenuHandlerFunc menuTabGeneral[] = { menuRadioSpecialFunctions, menuRadioTrainer, menuRadioVersion, - menuRadioDiagKeys, - menuRadioDiagAnalogs, - menuRadioHardware, - menuRadioCalibration + menuRadioHardware }; enum MenuModelIndexes { diff --git a/radio/src/gui/128x64/radio_calibration.cpp b/radio/src/gui/128x64/radio_calibration.cpp index de1a5e3c7..ee6d8d68a 100644 --- a/radio/src/gui/128x64/radio_calibration.cpp +++ b/radio/src/gui/128x64/radio_calibration.cpp @@ -172,7 +172,7 @@ void menuCommonCalib(event_t event) void menuRadioCalibration(event_t event) { - check_simple(event, MENU_RADIO_CALIBRATION, menuTabGeneral, DIM(menuTabGeneral), 0); + check_submenu_simple(event, 0); TITLE(STR_MENUCALIBRATION); menuCommonCalib(READ_ONLY() ? 0 : event); if (menuEvent) { diff --git a/radio/src/gui/128x64/radio_diaganas.cpp b/radio/src/gui/128x64/radio_diaganas.cpp index 0385c4227..7665f7ca4 100644 --- a/radio/src/gui/128x64/radio_diaganas.cpp +++ b/radio/src/gui/128x64/radio_diaganas.cpp @@ -31,7 +31,7 @@ void menuRadioDiagAnalogs(event_t event) #define ANAS_ITEMS_COUNT 1 #endif - SIMPLE_MENU(STR_MENU_RADIO_ANALOGS, menuTabGeneral, MENU_RADIO_ANALOGS_TEST, HEADER_LINE+ANAS_ITEMS_COUNT); + SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, HEADER_LINE+ANAS_ITEMS_COUNT); for (uint8_t i=0; i 9 diff --git a/radio/src/gui/128x64/radio_diagkeys.cpp b/radio/src/gui/128x64/radio_diagkeys.cpp index 4cd34b416..35a3d73fa 100644 --- a/radio/src/gui/128x64/radio_diagkeys.cpp +++ b/radio/src/gui/128x64/radio_diagkeys.cpp @@ -36,7 +36,7 @@ void displaySwitchState(uint8_t x, uint8_t y, uint8_t sw) void menuRadioDiagKeys(event_t event) { - SIMPLE_MENU(STR_MENU_RADIO_SWITCHES, menuTabGeneral, MENU_RADIO_SWITCHES_TEST, 1); + SIMPLE_SUBMENU(STR_MENU_RADIO_SWITCHES, 1); lcdDrawText(14*FW, MENU_HEADER_HEIGHT+2*FH, STR_VTRIM); diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index 85bb01e33..6025a9b6e 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -122,6 +122,7 @@ enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_BLUETOOTH_NAME, #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, + ITEM_RADIO_HARDWARE_DEBUG, ITEM_RADIO_HARDWARE_MAX }; @@ -151,7 +152,7 @@ enum MenuRadioHardwareItems { void menuRadioHardware(event_t event) { - MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/ }); + MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, HEADER_LINE+ITEM_RADIO_HARDWARE_MAX, { HEADER_LINE_COLUMNS 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, 0/*max bauds*/, BLUETOOTH_ROWS 0/*jitter filter*/, 1 /* debugs */ }); uint8_t sub = menuVerticalPosition - HEADER_LINE; @@ -168,6 +169,10 @@ void menuRadioHardware(event_t event) switch(k) { case ITEM_RADIO_HARDWARE_LABEL_STICKS: lcdDrawTextAlignedLeft(y, STR_STICKS); + lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_CALIB_BTN, attr); + if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { + pushMenu(menuRadioCalibration); + } break; case ITEM_RADIO_HARDWARE_STICK1: case ITEM_RADIO_HARDWARE_STICK2: @@ -280,6 +285,18 @@ void menuRadioHardware(event_t event) case ITEM_RADIO_HARDWARE_JITTER_FILTER: g_eeGeneral.jitterFilter = 1 - editCheckBox(1 - g_eeGeneral.jitterFilter, HW_SETTINGS_COLUMN2, y, STR_JITTER_FILTER, attr, event); break; + + case ITEM_RADIO_HARDWARE_DEBUG: + lcdDrawTextAlignedLeft(y, STR_DEBUG); + lcdDrawText(HW_SETTINGS_COLUMN2, y, STR_ANALOGS_BTN, menuHorizontalPosition == 0 ? attr : 0); + lcdDrawText(lcdLastRightPos + 2, y, STR_SWITCHES_BTN, menuHorizontalPosition == 1 ? attr : 0); + if (attr && event == EVT_KEY_FIRST(KEY_ENTER)) { + if (menuHorizontalPosition == 0) + pushMenu(menuRadioDiagAnalogs); + else + pushMenu(menuRadioDiagKeys); + } + break; } } } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 6684816da..c804a3fb3 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -453,6 +453,10 @@ const char STR_SUBTYPE[] = TR_SUBTYPE; #endif const char STR_RESET_BTN[] = TR_RESET_BTN; +const char STR_DEBUG[] = TR_DEBUG; +const char STR_SWITCHES_BTN[] = TR_SWITCHES_BTN; +const char STR_ANALOGS_BTN[] = TR_ANALOGS_BTN; +const char STR_CALIB_BTN[] = TR_CALIB_BTN; #if defined(SDCARD) const char STR_BACKUP_MODEL[] = TR_BACKUP_MODEL; diff --git a/radio/src/translations.h b/radio/src/translations.h index 2ec3981dd..3cfadc987 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -649,6 +649,10 @@ extern const char STR_PERSISTENT_MAH[]; #endif extern const char STR_RESET_BTN[]; +extern const char STR_DEBUG[]; +extern const char STR_SWITCHES_BTN[]; +extern const char STR_ANALOGS_BTN[]; +extern const char STR_CALIB_BTN[]; #if defined(SDCARD) extern const char STR_BACKUP_MODEL[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 4294d322a..4ac05bd81 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -958,6 +958,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Volby") #define TR_TRAINER "Trenér" #define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index ab02c533b..959a58842 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -963,6 +963,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd","Bind")) //9XR-Pro #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) //9XR-Pro #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "DSC Buchse PPM In/Out" #define TR_ANTENNAPROBLEM CENTER "TX-Antennenproblem!" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 322932530..fd1c75c68 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -962,6 +962,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Rng", "Range")) #define TR_RESET_BTN BUTTON("Reset") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Set") #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX antenna problem!" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 53da96ac6..af679dd62 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -969,6 +969,10 @@ #define TR_MODULE_BIND "[Enlace]" #define TR_MODULE_RANGE "[Limites]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Ajuste]" #define TR_TRAINER "Aprendiz" #define TR_ANTENNAPROBLEM CENTER "¡Problema antena TX!" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b09f22406..ec3405e32 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -961,6 +961,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 26a901ffc..3437cea2b 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -973,6 +973,10 @@ #define TR_MODULE_BIND BUTTON(TR("Bnd", "Bind")) #define TR_MODULE_RANGE BUTTON(TR("Prt", "Port.")) #define TR_RESET_BTN BUTTON("RAZ") +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET BUTTON("Déf") #define TR_TRAINER "Ecolage" #define TR_ANTENNAPROBLEM CENTER "Antenne radio défectueuse!" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 32d1eebc0..5f6fdfcfa 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -963,6 +963,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER TR("Trainer","Maestro/Allievo") #define TR_ANTENNAPROBLEM CENTER "Problemi antenna TX!" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index ab9e48e41..23899ffeb 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -964,6 +964,10 @@ #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_RANGE TR("[Rng]", "[Range]") #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer Poort" #define TR_ANTENNAPROBLEM CENTER "TX-Antenneprobleem!" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 8f7af0ef1..276042762 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -964,6 +964,10 @@ #define TR_MODULE_BIND TR("[BND]","[Bind]") #define TR_MODULE_RANGE TR("[Zas]","Zasięg") #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Port Trenera" #define TR_ANTENNAPROBLEM CENTER "Problem z anteną TX" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 255b5f3f6..915760275 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -968,6 +968,10 @@ #define TR_MODULE_BIND "[Bind]" #define TR_MODULE_RANGE "[Range]" #define TR_RESET_BTN "[Reset]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Set]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 9d2c71498..9b6cef3bc 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -975,6 +975,10 @@ #define TR_MODULE_BIND TR("[Bnd]", "[Bind]") #define TR_MODULE_RANGE TR("[Tst]", "[Testa]") #define TR_RESET_BTN "[Nollställ]" +#define TR_DEBUG "Debug" +#define TR_SWITCHES_BTN BUTTON("SW") +#define TR_ANALOGS_BTN BUTTON("Ana") +#define TR_CALIB_BTN BUTTON("Calibration") #define TR_SET "[Spara]" #define TR_TRAINER "Trainer" #define TR_ANTENNAPROBLEM CENTER "Fel på TX-antennen"