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

GVARs added to source popup

Browse Source
This commit is contained in:
Andre Bernet
2015-03-28 15:16:52 +04:00
parent 531854dd97
commit 8a9686716c
14 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/Taranis/menus.h
+1 -1
View File
@@ -327,7 +327,7 @@ extern uint8_t s_warning_info_flags;
#define NAVIGATION_MENUS
#define MENU_ADD_ITEM(s) s_menu[s_menu_count++] = s
#define MENU_MAX_LINES 11
#define MENU_MAX_LINES 12
#define MENU_MAX_DISPLAY_LINES 6
#define MENU_ADD_SD_ITEM(s) MENU_ADD_ITEM(s)
#define MENU_LINE_LENGTH (LEN_MODEL_NAME+12)
radio/src/gui/Taranis/navigation.cpp
+4
View File
@@ -95,6 +95,8 @@ void onLongEnterPress(const char *result)
s_source = MIXSRC_FIRST_TRAINER;
else if (result == STR_MENU_CHANNELS)
s_source = getFirstAvailableSource(MIXSRC_FIRST_CH, MIXSRC_LAST_CH, isSourceAvailable);
else if (result == STR_MENU_GVARS)
s_source = MIXSRC_FIRST_GVAR;
else if (result == STR_MENU_TELEMETRY) {
for (int i = 0; i < TELEM_VALUES_MAX; i++) {
@@ -270,6 +272,8 @@ int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int
if (i_min <= MIXSRC_FIRST_SWITCH && i_max >= MIXSRC_FIRST_SWITCH) MENU_ADD_ITEM(STR_MENU_SWITCHES);
if (i_min <= MIXSRC_FIRST_TRAINER && i_max >= MIXSRC_FIRST_TRAINER) MENU_ADD_ITEM(STR_MENU_TRAINER);
if (i_min <= MIXSRC_FIRST_CH && i_max >= MIXSRC_FIRST_CH) MENU_ADD_ITEM(STR_MENU_CHANNELS);
if (i_min <= MIXSRC_FIRST_GVAR && i_max >= MIXSRC_FIRST_GVAR && isValueAvailable(MIXSRC_FIRST_GVAR))
MENU_ADD_ITEM(STR_MENU_GVARS);
if (i_min <= MIXSRC_FIRST_TELEM && i_max >= MIXSRC_FIRST_TELEM) {
bool available = false;
radio/src/translations.cpp
+1
View File
@@ -598,6 +598,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR;
const pm_char STR_MENU_SWITCHES[] PROGMEM = TR_MENU_SWITCHES;
const pm_char STR_MENU_TRAINER[] PROGMEM = TR_MENU_TRAINER;
const pm_char STR_MENU_CHANNELS[] PROGMEM = TR_MENU_CHANNELS;
const pm_char STR_MENU_GVARS[] PROGMEM = TR_MENU_GVARS;
const pm_char STR_MENU_TELEMETRY[] PROGMEM = TR_MENU_TELEMETRY;
#endif
radio/src/translations.h
+1
View File
@@ -808,6 +808,7 @@ extern const pm_char STR_BLCOLOR[];
extern const pm_char STR_MENU_SWITCHES[];
extern const pm_char STR_MENU_TRAINER[];
extern const pm_char STR_MENU_CHANNELS[];
extern const pm_char STR_MENU_GVARS[];
extern const pm_char STR_MENU_TELEMETRY[];
#endif
radio/src/translations/cz.h.txt
+1
View File
@@ -1075,6 +1075,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/de.h.txt
+1
View File
@@ -1074,6 +1074,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/en.h.txt
+1
View File
@@ -1074,6 +1074,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/es.h.txt
+4 -3
View File
@@ -1014,7 +1014,7 @@
#define TR_TELEMETRYFULL "All telemetry slots full!"
#define TR_MENU_INPUTS "\314Inputs"
#define TR_MENU_LUA "Lua scripts"
#define TR_MENU_LUA "\322Lua scripts"
#define TR_MENU_STICKS "\307Sticks"
#define TR_MENU_POTS "\310Pots"
#define TR_MENU_MAX "\315MAX"
@@ -1022,8 +1022,9 @@
#define TR_MENU_TRIMS "\313Trims"
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\318Channels"
#define TR_MENU_TELEMETRY "\319Telemetry"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
#define ZSTR_SWR "SWR"
radio/src/translations/fi.h.txt
+1
View File
@@ -1023,6 +1023,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/fr.h.txt
+1
View File
@@ -1066,6 +1066,7 @@
#define TR_MENU_SWITCHES "\312Inters"
#define TR_MENU_TRAINER "\317Ecolage"
#define TR_MENU_CHANNELS "\320Canaux"
#define TR_MENU_GVARS "\311Vars. glob."
#define TR_MENU_TELEMETRY "\321Télémesure"
#define ZSTR_RSSI "RSSI"
radio/src/translations/it.h.txt
+1
View File
@@ -1023,6 +1023,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/pl.h.txt
+1
View File
@@ -1021,6 +1021,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/pt.h.txt
+1
View File
@@ -1023,6 +1023,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"
radio/src/translations/se.h.txt
+1
View File
@@ -1023,6 +1023,7 @@
#define TR_MENU_SWITCHES "\312Switches"
#define TR_MENU_TRAINER "\317Trainer"
#define TR_MENU_CHANNELS "\320Channels"
#define TR_MENU_GVARS "\311GVars"
#define TR_MENU_TELEMETRY "\321Telemetry"
#define ZSTR_RSSI "RSSI"