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, X9 version

Browse Source
This commit is contained in:
3djc
2019-03-16 10:57:03 +01:00
parent 9d7628e2bd
commit 0aa3153f4d
17 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/212x64/menu_radio.cpp
+2 -5
View File
@@ -2,7 +2,7 @@
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
@@ -26,10 +26,7 @@ const MenuHandlerFunc menuTabGeneral[] = {
menuRadioSpecialFunctions,
menuRadioTrainer,
menuRadioVersion,
menuRadioDiagKeys,
menuRadioDiagAnalogs,
menuRadioHardware,
menuRadioCalibration
menuRadioHardware
};
void menuRadioSpecialFunctions(event_t event)
radio/src/gui/212x64/menus.h
-3
View File
@@ -66,10 +66,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
};
radio/src/gui/212x64/radio_calibration.cpp
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
@@ -195,7 +195,7 @@ void menuCommonCalib(event_t event)
void menuRadioCalibration(event_t event)
{
check_simple(STR_MENUCALIBRATION, event, MENU_RADIO_CALIBRATION, menuTabGeneral, DIM(menuTabGeneral), 0);
check_submenu_simple(STR_MENUCALIBRATION, event, 0);
menuCommonCalib(READ_ONLY() ? 0 : event);
if (menuEvent) {
menuCalibrationState = CALIB_START;
radio/src/gui/212x64/radio_diaganas.cpp
+1 -1
View File
@@ -22,7 +22,7 @@
void menuRadioDiagAnalogs(event_t event)
{
SIMPLE_MENU(STR_MENU_RADIO_ANALOGS, menuTabGeneral, MENU_RADIO_ANALOGS_TEST, 0);
SIMPLE_SUBMENU(STR_MENU_RADIO_ANALOGS, 0);
for (uint8_t i=0; i<NUM_STICKS+NUM_POTS+NUM_SLIDERS; i++) {
coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
radio/src/gui/212x64/radio_diagkeys.cpp
+2 -2
View File
@@ -2,7 +2,7 @@
* Copyright (C) OpenTX
*
* Based on code named
* th9x - http://code.google.com/p/th9x
* th9x - http://code.google.com/p/th9x
* er9x - http://code.google.com/p/er9x
* gruvin9x - http://code.google.com/p/gruvin9x
*
@@ -28,7 +28,7 @@ void displayKeyState(uint8_t x, uint8_t y, uint8_t key)
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/212x64/radio_hardware.cpp
+19 -1
View File
@@ -60,6 +60,7 @@ enum menuRadioHwItems {
#endif
ITEM_RADIO_HARDWARE_UART3_MODE,
ITEM_RADIO_HARDWARE_JITTER_FILTER,
ITEM_RADIO_HARDWARE_DEBUG,
ITEM_RADIO_HARDWARE_MAX
};
@@ -90,7 +91,7 @@ enum menuRadioHwItems {
void menuRadioHardware(event_t event)
{
MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { LABEL(Sticks), 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0 });
MENU(STR_HARDWARE, menuTabGeneral, MENU_RADIO_HARDWARE, ITEM_RADIO_HARDWARE_MAX, { 0, 0, 0, 0, 0, LABEL(Pots), POTS_ROWS, LABEL(Switches), SWITCHES_ROWS, BLUETOOTH_ROWS 0, 1 });
uint8_t sub = menuVerticalPosition;
@@ -105,6 +106,10 @@ void menuRadioHardware(event_t event)
switch (k) {
case ITEM_RADIO_HARDWARE_LABEL_STICKS:
lcdDrawTextAlignedLeft(y, STR_STICKS);
lcdDrawText(HW_SETTINGS_COLUMN, 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:
@@ -233,6 +238,19 @@ void menuRadioHardware(event_t event)
g_eeGeneral.jitterFilter = 1 - editCheckBox(b, HW_SETTINGS_COLUMN, y, STR_JITTER_FILTER, attr, event);
break;
}
case ITEM_RADIO_HARDWARE_DEBUG:
lcdDrawTextAlignedLeft(y, STR_DEBUG);
lcdDrawText(HW_SETTINGS_COLUMN
, 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/cz.h.txt
+2 -2
View File
@@ -959,8 +959,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET BUTTON("Volby")
#define TR_TRAINER "Trenér"
radio/src/translations/de.h.txt
+2 -2
View File
@@ -964,8 +964,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET BUTTON("Set")
#define TR_TRAINER "DSC Buchse PPM In/Out"
radio/src/translations/en.h.txt
+2 -2
View File
@@ -963,8 +963,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET BUTTON("Set")
#define TR_TRAINER "Trainer"
radio/src/translations/es.h.txt
+2 -2
View File
@@ -970,8 +970,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Ajuste]"
#define TR_TRAINER "Aprendiz"
radio/src/translations/fi.h.txt
+2 -2
View File
@@ -962,8 +962,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
radio/src/translations/fr.h.txt
+2 -2
View File
@@ -974,8 +974,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET BUTTON("Déf")
#define TR_TRAINER "Ecolage"
radio/src/translations/it.h.txt
+2 -2
View File
@@ -964,8 +964,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Set]"
#define TR_TRAINER TR("Trainer","Maestro/Allievo")
radio/src/translations/nl.h.txt
+2 -2
View File
@@ -965,8 +965,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer Poort"
radio/src/translations/pl.h.txt
+2 -2
View File
@@ -965,8 +965,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Set]"
#define TR_TRAINER "Port Trenera"
radio/src/translations/pt.h.txt
+2 -2
View File
@@ -969,8 +969,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Set]"
#define TR_TRAINER "Trainer"
radio/src/translations/se.h.txt
+2 -2
View File
@@ -976,8 +976,8 @@
#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_SWITCHES_BTN BUTTON(TR("SW","Switches"))
#define TR_ANALOGS_BTN BUTTON(TR("Ana","Analogs"))
#define TR_CALIB_BTN BUTTON("Calibration")
#define TR_SET "[Spara]"
#define TR_TRAINER "Trainer"