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

Move analogs and switches debugs for main RADIO menu

Browse Source
This commit is contained in:
3djc
2019-03-16 10:16:55 +01:00
parent 89e0218047
commit 9d7628e2bd
18 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/128x64/menus.h
+1 -7
View File
@@ -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 {
radio/src/gui/128x64/radio_calibration.cpp
+1 -1
View File
@@ -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) {
radio/src/gui/128x64/radio_diaganas.cpp
+1 -1
View File
@@ -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<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
#if (NUM_STICKS+NUM_POTS+NUM_SLIDERS) > 9
radio/src/gui/128x64/radio_diagkeys.cpp
+1 -1
View File
@@ -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);
radio/src/gui/128x64/radio_hardware.cpp
+18 -1
View File
@@ -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;
}
}
}
radio/src/translations.cpp
+4
View File
@@ -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;
radio/src/translations.h
+4
View File
@@ -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[];
radio/src/translations/cz.h.txt
+4
View File
@@ -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!"
radio/src/translations/de.h.txt
+4
View File
@@ -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!"
radio/src/translations/en.h.txt
+4
View File
@@ -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!"
radio/src/translations/es.h.txt
+4
View File
@@ -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!"
radio/src/translations/fi.h.txt
+4
View File
@@ -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!"
radio/src/translations/fr.h.txt
+4
View File
@@ -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!"
radio/src/translations/it.h.txt
+4
View File
@@ -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!"
radio/src/translations/nl.h.txt
+4
View File
@@ -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!"
radio/src/translations/pl.h.txt
+4
View File
@@ -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"
radio/src/translations/pt.h.txt
+4
View File
@@ -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!"
radio/src/translations/se.h.txt
+4
View File
@@ -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"