From f59b8f961efe9ce06d2c1ba88bc053baab8c3042 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 23 Mar 2015 13:32:43 +0400 Subject: [PATCH 1/5] Source popup menu --- radio/src/gui/Taranis/menus.h | 3 +- radio/src/gui/Taranis/navigation.cpp | 119 +++++++++++++++++++++++++++ radio/src/gui/Taranis/popups.cpp | 14 ++-- radio/src/myeeprom.h | 25 +++--- radio/src/translations.cpp | 11 +++ radio/src/translations.h | 11 +++ radio/src/translations/cz.h.txt | 12 +++ radio/src/translations/de.h.txt | 12 +++ radio/src/translations/en.h.txt | 12 +++ radio/src/translations/es.h.txt | 12 +++ radio/src/translations/fi.h.txt | 12 +++ radio/src/translations/fr.h.txt | 12 +++ radio/src/translations/it.h.txt | 12 +++ radio/src/translations/pl.h.txt | 12 +++ radio/src/translations/pt.h.txt | 12 +++ radio/src/translations/se.h.txt | 12 +++ 16 files changed, 284 insertions(+), 19 deletions(-) diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h index 6640661ea..34cf838d0 100755 --- a/radio/src/gui/Taranis/menus.h +++ b/radio/src/gui/Taranis/menus.h @@ -326,7 +326,8 @@ 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 6 +#define MENU_MAX_LINES 11 +#define MENU_MAX_DISPLAY_LINES 6 #define MENU_ADD_SD_ITEM(s) MENU_ADD_ITEM(s) #define MENU_LINE_LENGTH (LEN_MODEL_NAME+12) extern const char *s_menu[MENU_MAX_LINES]; diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp index b4ace4091..93d4d0e78 100755 --- a/radio/src/gui/Taranis/navigation.cpp +++ b/radio/src/gui/Taranis/navigation.cpp @@ -42,6 +42,7 @@ horzpos_t m_posHorz; int8_t s_editMode; uint8_t s_noHi; uint8_t calibrationState; +int s_source = MIXSRC_NONE; #if defined(AUTOSWITCH) int8_t checkIncDecMovedSwitch(int8_t val) @@ -70,6 +71,61 @@ INIT_STOPS(stops100, 3, -100, 0, 100) INIT_STOPS(stops1000, 3, -1000, 0, 1000) INIT_STOPS(stopsSwitch, 15, SWSRC_FIRST, CATEGORY_END(-SWSRC_FIRST_LOGICAL_SWITCH), CATEGORY_END(-SWSRC_FIRST_TRIM), CATEGORY_END(-SWSRC_LAST_SWITCH+1), 0, CATEGORY_END(SWSRC_LAST_SWITCH), CATEGORY_END(SWSRC_FIRST_TRIM-1), CATEGORY_END(SWSRC_FIRST_LOGICAL_SWITCH-1), SWSRC_LAST) +void onLongEnterPress(const char *result) +{ + if (result == STR_MENU_INPUTS) { + for (int i = MIXSRC_FIRST_INPUT; i <= MIXSRC_LAST_INPUT; i++) { + if (isInputAvailable(i)) { + s_source = i; + break; + } + } + } +#if defined(LUA_MODEL_SCRIPTS) + if (result == STR_MENU_LUA) { + for (int i = MIXSRC_FIRST_LUA; i <= MIXSRC_LAST_LUA; i++) { + if (isSourceAvailable(i)) { + s_source = i; + break; + } + } + } +#endif + if (result == STR_MENU_STICKS) + s_source = MIXSRC_FIRST_STICK; + if (result == STR_MENU_POTS) + s_source = MIXSRC_FIRST_POT; + if (result == STR_MENU_MAX) + s_source = MIXSRC_MAX; + if (result == STR_MENU_HELI) + s_source = MIXSRC_FIRST_HELI; + if (result == STR_MENU_TRIMS) + s_source = MIXSRC_FIRST_TRIM; + if (result == STR_MENU_SWITCHES) + s_source = MIXSRC_FIRST_SWITCH; + if (result == STR_MENU_TRAINER) + s_source = MIXSRC_FIRST_TRAINER; + + if (result == STR_MENU_CHANNELS) { + for (int i = MIXSRC_FIRST_CH; i <= MIXSRC_LAST_CH; i++) { + if (isSourceAvailable(i)) { + s_source = i; + break; + } + } + } + + if (result == STR_MENU_TELEMETRY) { + for (int i = 0; i < TELEM_VALUES_MAX; i++) { + TelemetrySensor * sensor = & g_model.telemetrySensors[i]; + if (sensor->isAvailable()) { + s_source = MIXSRC_FIRST_TELEM + 3*i; + break; + } + } + } +} + int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags, IsValueAvailable isValueAvailable, const CheckIncDecStops &stops) { int newval = val; @@ -207,6 +263,68 @@ int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int else { checkIncDec_Ret = 0; } + + if (i_flags & INCDEC_SOURCE) { + if (event == EVT_KEY_LONG(KEY_ENTER)) { + killEvents(event); + s_source = MIXSRC_NONE; + + if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) { + bool available = false; + for (int i = MIXSRC_FIRST_INPUT; i <= MIXSRC_LAST_INPUT; i++) { + if (isInputAvailable(i)) { + available = true; + break; + } + } + if (available) + MENU_ADD_ITEM(STR_MENU_INPUTS); + } +#if defined(LUA_MODEL_SCRIPTS) + if (i_min <= MIXSRC_FIRST_LUA && i_max >= MIXSRC_FIRST_LUA) { + bool available = false; + for (int i = MIXSRC_FIRST_LUA; i <= MIXSRC_LAST_LUA; i++) { + if (isSourceAvailable(i)) { + available = true; + break; + } + } + if (available) + MENU_ADD_ITEM(STR_MENU_LUA); + } +#endif + if (i_min <= MIXSRC_FIRST_STICK && i_max >= MIXSRC_FIRST_STICK) MENU_ADD_ITEM(STR_MENU_STICKS); + if (i_min <= MIXSRC_FIRST_POT && i_max >= MIXSRC_FIRST_POT) MENU_ADD_ITEM(STR_MENU_POTS); + if (i_min <= MIXSRC_MAX && i_max >= MIXSRC_MAX) MENU_ADD_ITEM(STR_MENU_MAX); +#if defined(HELI) + if (i_min <= MIXSRC_FIRST_HELI && i_max >= MIXSRC_FIRST_HELI) MENU_ADD_ITEM(STR_MENU_HELI); +#endif + if (i_min <= MIXSRC_FIRST_TRIM && i_max >= MIXSRC_FIRST_TRIM) MENU_ADD_ITEM(STR_MENU_TRIMS); + 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_TELEM && i_max >= MIXSRC_FIRST_TELEM) { + bool available = false; + for (int i = 0; i < TELEM_VALUES_MAX; i++) { + TelemetrySensor * sensor = & g_model.telemetrySensors[i]; + if (sensor->isAvailable()) { + available = true; + break; + } + } + if (available) + MENU_ADD_ITEM(STR_MENU_TELEMETRY); + } + menuHandler = onLongEnterPress; + } + if (s_source != MIXSRC_NONE) { + newval = s_source; + if (s_source != MIXSRC_MAX) + s_editMode = 1; + s_source = MIXSRC_NONE; + } + } return newval; } @@ -229,6 +347,7 @@ void onLongMenuPress(const char *result) } } + tmr10ms_t menuEntryTime; void check(const char *name, check_event_t event, uint8_t curr, const MenuFuncP *menuTab, uint8_t menuTabSize, const pm_uint8_t *horTab, uint8_t horTabMax, vertpos_t rowcount, uint8_t flags) diff --git a/radio/src/gui/Taranis/popups.cpp b/radio/src/gui/Taranis/popups.cpp index 36646b54f..895d9c97b 100755 --- a/radio/src/gui/Taranis/popups.cpp +++ b/radio/src/gui/Taranis/popups.cpp @@ -127,18 +127,18 @@ const char * displayMenu(uint8_t event) { const char * result = NULL; - uint8_t display_count = min(s_menu_count, (uint16_t)MENU_MAX_LINES); + uint8_t display_count = min(s_menu_count, (uint16_t)MENU_MAX_DISPLAY_LINES); uint8_t y = (display_count >= 5 ? MENU_Y - FH - 1 : MENU_Y); drawFilledRect(MENU_X, y, MENU_W, display_count * (FH+1) + 2, SOLID, ERASE); lcd_rect(MENU_X, y, MENU_W, display_count * (FH+1) + 2); for (uint8_t i=0; i display_count) { - displayScrollbar(MENU_X+MENU_W-1, y+1, MENU_MAX_LINES * (FH+1), s_menu_offset, s_menu_count, MENU_MAX_LINES); + displayScrollbar(MENU_X+MENU_W-1, y+1, MENU_MAX_LINES * (FH+1), s_menu_offset, s_menu_count, display_count); } switch(event) { @@ -152,9 +152,9 @@ const char * displayMenu(uint8_t event) result = STR_UPDATE_LIST; } else { - s_menu_item = display_count - 1; - if (s_menu_count > MENU_MAX_LINES) { - s_menu_offset = s_menu_count - display_count; + s_menu_item = min(display_count, (uint8_t)MENU_MAX_DISPLAY_LINES)-1; + if (s_menu_count > MENU_MAX_DISPLAY_LINES) { + s_menu_offset = s_menu_count - MENU_MAX_DISPLAY_LINES; result = STR_UPDATE_LIST; } } @@ -179,7 +179,7 @@ const char * displayMenu(uint8_t event) break; CASE_EVT_ROTARY_BREAK case EVT_KEY_BREAK(KEY_ENTER): - result = s_menu[s_menu_item]; + result = s_menu[s_menu_item+s_menu_offset]; // no break case EVT_KEY_BREAK(KEY_EXIT): s_menu_count = 0; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 383422e50..af4a513d7 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1766,10 +1766,11 @@ enum MixSources { MIXSRC_LAST_LUA = MIXSRC_FIRST_LUA+(MAX_SCRIPTS*MAX_SCRIPT_OUTPUTS)-1, #endif - MIXSRC_Rud, LUA_EXPORT("rud", "Rudder") - MIXSRC_Ele, LUA_EXPORT("ele", "Elevator") - MIXSRC_Thr, LUA_EXPORT("thr", "Throttle") - MIXSRC_Ail, LUA_EXPORT("ail", "Aileron") + MIXSRC_FIRST_STICK, + MIXSRC_Rud = MIXSRC_FIRST_STICK, LUA_EXPORT("rud", "Rudder") + MIXSRC_Ele, LUA_EXPORT("ele", "Elevator") + MIXSRC_Thr, LUA_EXPORT("thr", "Throttle") + MIXSRC_Ail, LUA_EXPORT("ail", "Aileron") MIXSRC_FIRST_POT, #if defined(PCBTARANIS) @@ -1812,14 +1813,16 @@ enum MixSources { MIXSRC_MAX, - MIXSRC_CYC1, LUA_EXPORT("cyc1", "Cyclic 1") - MIXSRC_CYC2, LUA_EXPORT("cyc2", "Cyclic 2") - MIXSRC_CYC3, LUA_EXPORT("cyc3", "Cyclic 3") + MIXSRC_FIRST_HELI, + MIXSRC_CYC1 = MIXSRC_FIRST_HELI, LUA_EXPORT("cyc1", "Cyclic 1") + MIXSRC_CYC2, LUA_EXPORT("cyc2", "Cyclic 2") + MIXSRC_CYC3, LUA_EXPORT("cyc3", "Cyclic 3") - MIXSRC_TrimRud, LUA_EXPORT("trim-rud", "Rudder trim") - MIXSRC_TrimEle, LUA_EXPORT("trim-ele", "Elevator trim") - MIXSRC_TrimThr, LUA_EXPORT("trim-thr", "Throttle trim") - MIXSRC_TrimAil, LUA_EXPORT("trim-ail", "Aileron trim") + MIXSRC_FIRST_TRIM, + MIXSRC_TrimRud = MIXSRC_FIRST_TRIM, LUA_EXPORT("trim-rud", "Rudder trim") + MIXSRC_TrimEle, LUA_EXPORT("trim-ele", "Elevator trim") + MIXSRC_TrimThr, LUA_EXPORT("trim-thr", "Throttle trim") + MIXSRC_TrimAil, LUA_EXPORT("trim-ail", "Aileron trim") MIXSRC_FIRST_SWITCH, diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 8414e8863..fe3d2aeef 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -588,6 +588,17 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_SCRIPT[] PROGMEM = TR_SCRIPT; const pm_char STR_INPUTS[] PROGMEM = TR_INPUTS; const pm_char STR_OUTPUTS[] PROGMEM = TR_OUTPUTS; + const pm_char STR_MENU_INPUTS[] PROGMEM = TR_MENU_INPUTS; + const pm_char STR_MENU_LUA[] PROGMEM = TR_MENU_LUA; + const pm_char STR_MENU_STICKS[] PROGMEM = TR_MENU_STICKS; + const pm_char STR_MENU_POTS[] PROGMEM = TR_MENU_POTS; + const pm_char STR_MENU_MAX[] PROGMEM = TR_MENU_MAX; + const pm_char STR_MENU_HELI[] PROGMEM = TR_MENU_HELI; + const pm_char STR_MENU_TRIMS[] PROGMEM = TR_MENU_TRIMS; + 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_TELEMETRY[] PROGMEM = TR_MENU_TELEMETRY; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations.h b/radio/src/translations.h index 74eb7f43d..c0e857fc6 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -798,6 +798,17 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_SCRIPT[]; extern const pm_char STR_INPUTS[]; extern const pm_char STR_OUTPUTS[]; + extern const pm_char STR_MENU_INPUTS[]; + extern const pm_char STR_MENU_LUA[]; + extern const pm_char STR_MENU_STICKS[]; + extern const pm_char STR_MENU_POTS[]; + extern const pm_char STR_MENU_MAX[]; + extern const pm_char STR_MENU_HELI[]; + extern const pm_char STR_MENU_TRIMS[]; + 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_TELEMETRY[]; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 7794b600a..d1a5740f6 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1065,6 +1065,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 6ea81624b..78bc14793 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1064,6 +1064,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index ec3a2f59d..671926bde 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1064,6 +1064,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index f1e1c24e8..aa401c9be 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1000,6 +1000,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8b35c8ba6..f8840baf6 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1000,6 +1000,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 201573513..d7a743ac0 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1060,6 +1060,18 @@ #define TR_FILTER "Filtrage" #define TR_TELEMETRYFULL "Plus de capteurs libres!" +#define TR_MENU_INPUTS "Entrées" +#define TR_MENU_LUA "Scripts Lua" +#define TR_MENU_STICKS "\307Manches" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclique" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Inters" +#define TR_MENU_TRAINER "Ecolage" +#define TR_MENU_CHANNELS "Canaux" +#define TR_MENU_TELEMETRY "Télémesure" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 987ed947e..fca313d46 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1000,6 +1000,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index a88fee4ea..9d6f0de17 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -998,6 +998,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 7c7299a2e..ed4c5044f 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1000,6 +1000,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index de897e54a..82bfe4e87 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1000,6 +1000,18 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" +#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_STICKS "\307Sticks" +#define TR_MENU_POTS "\310Pots" +#define TR_MENU_MAX "MAX" +#define TR_MENU_HELI "Cyclic" +#define TR_MENU_TRIMS "\313Trims" +#define TR_MENU_SWITCHES "\312Switches" +#define TR_MENU_TRAINER "Trainer" +#define TR_MENU_CHANNELS "Channels" +#define TR_MENU_TELEMETRY "Telemetry" + #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" #define ZSTR_A1 "A1" From 372f6e6d7b1799413096971b247f154ddffad476 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Mon, 23 Mar 2015 14:01:26 +0400 Subject: [PATCH 2/5] Refactoring --- radio/src/gui/Taranis/helpers.cpp | 11 +++++++ radio/src/gui/Taranis/menus.h | 1 + radio/src/gui/Taranis/navigation.cpp | 49 +++++----------------------- 3 files changed, 20 insertions(+), 41 deletions(-) diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp index ac1037337..9e772d379 100755 --- a/radio/src/gui/Taranis/helpers.cpp +++ b/radio/src/gui/Taranis/helpers.cpp @@ -347,3 +347,14 @@ bool modelHasNotes() return isFileAvailable(filename); } +int getFirstAvailableSource(int min, int max, bool (*func)(int)) +{ + int retval = MIXSRC_NONE; + for (int i = min; i <= max; i++) { + if ((*func)(i)) { + retval = i; + break; + } + } + return retval; +} diff --git a/radio/src/gui/Taranis/menus.h b/radio/src/gui/Taranis/menus.h index 34cf838d0..ddb639f46 100755 --- a/radio/src/gui/Taranis/menus.h +++ b/radio/src/gui/Taranis/menus.h @@ -202,6 +202,7 @@ bool isSwitchAvailableInCustomFunctions(int swtch); bool isSwitchAvailableInMixes(int swtch); bool isSwitchAvailableInTimers(int swtch); bool isModuleAvailable(int module); +int getFirstAvailableSource(int min, int max, bool (*func)(int)); #define AUTOSWITCH_ENTER_LONG() (attr && event==EVT_KEY_LONG(KEY_ENTER)) #define CHECK_INCDEC_SWITCH(event, var, min, max, flags, available) \ var = checkIncDec(event, var, min, max, (flags)|INCDEC_SWITCH, available) diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp index 93d4d0e78..3a1076d4b 100755 --- a/radio/src/gui/Taranis/navigation.cpp +++ b/radio/src/gui/Taranis/navigation.cpp @@ -73,23 +73,11 @@ INIT_STOPS(stopsSwitch, 15, SWSRC_FIRST, CATEGORY_END(-SWSRC_FIRST_LOGICAL_SWITC void onLongEnterPress(const char *result) { - if (result == STR_MENU_INPUTS) { - for (int i = MIXSRC_FIRST_INPUT; i <= MIXSRC_LAST_INPUT; i++) { - if (isInputAvailable(i)) { - s_source = i; - break; - } - } - } + if (result == STR_MENU_INPUTS) + s_source = getFirstAvailableSource(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable)+1; #if defined(LUA_MODEL_SCRIPTS) - if (result == STR_MENU_LUA) { - for (int i = MIXSRC_FIRST_LUA; i <= MIXSRC_LAST_LUA; i++) { - if (isSourceAvailable(i)) { - s_source = i; - break; - } - } - } + if (result == STR_MENU_LUA) + s_source = getFirstAvailableSource(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable); #endif if (result == STR_MENU_STICKS) s_source = MIXSRC_FIRST_STICK; @@ -105,15 +93,8 @@ void onLongEnterPress(const char *result) s_source = MIXSRC_FIRST_SWITCH; if (result == STR_MENU_TRAINER) s_source = MIXSRC_FIRST_TRAINER; - - if (result == STR_MENU_CHANNELS) { - for (int i = MIXSRC_FIRST_CH; i <= MIXSRC_LAST_CH; i++) { - if (isSourceAvailable(i)) { - s_source = i; - break; - } - } - } + if (result == STR_MENU_CHANNELS) + s_source = getFirstAvailableSource(MIXSRC_FIRST_CH, MIXSRC_LAST_CH, isSourceAvailable); if (result == STR_MENU_TELEMETRY) { for (int i = 0; i < TELEM_VALUES_MAX; i++) { @@ -270,26 +251,12 @@ int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int s_source = MIXSRC_NONE; if (i_min <= MIXSRC_FIRST_INPUT && i_max >= MIXSRC_FIRST_INPUT) { - bool available = false; - for (int i = MIXSRC_FIRST_INPUT; i <= MIXSRC_LAST_INPUT; i++) { - if (isInputAvailable(i)) { - available = true; - break; - } - } - if (available) + if (getFirstAvailableSource(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable) != MIXSRC_NONE) MENU_ADD_ITEM(STR_MENU_INPUTS); } #if defined(LUA_MODEL_SCRIPTS) if (i_min <= MIXSRC_FIRST_LUA && i_max >= MIXSRC_FIRST_LUA) { - bool available = false; - for (int i = MIXSRC_FIRST_LUA; i <= MIXSRC_LAST_LUA; i++) { - if (isSourceAvailable(i)) { - available = true; - break; - } - } - if (available) + if (getFirstAvailableSource(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable) != MIXSRC_NONE) MENU_ADD_ITEM(STR_MENU_LUA); } #endif From 5d6e86e2adc4857bf95f618f19899e7452668b79 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Tue, 24 Mar 2015 10:05:27 +0400 Subject: [PATCH 3/5] Cosmetics --- radio/src/gui/Taranis/helpers.cpp | 2 +- radio/src/gui/Taranis/navigation.cpp | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/Taranis/helpers.cpp b/radio/src/gui/Taranis/helpers.cpp index 9e772d379..a2ae48121 100755 --- a/radio/src/gui/Taranis/helpers.cpp +++ b/radio/src/gui/Taranis/helpers.cpp @@ -354,7 +354,7 @@ int getFirstAvailableSource(int min, int max, bool (*func)(int)) if ((*func)(i)) { retval = i; break; - } } + } return retval; } diff --git a/radio/src/gui/Taranis/navigation.cpp b/radio/src/gui/Taranis/navigation.cpp index 3a1076d4b..18a7308b2 100755 --- a/radio/src/gui/Taranis/navigation.cpp +++ b/radio/src/gui/Taranis/navigation.cpp @@ -76,27 +76,27 @@ void onLongEnterPress(const char *result) if (result == STR_MENU_INPUTS) s_source = getFirstAvailableSource(MIXSRC_FIRST_INPUT, MIXSRC_LAST_INPUT, isInputAvailable)+1; #if defined(LUA_MODEL_SCRIPTS) - if (result == STR_MENU_LUA) + else if (result == STR_MENU_LUA) s_source = getFirstAvailableSource(MIXSRC_FIRST_LUA, MIXSRC_LAST_LUA, isSourceAvailable); #endif - if (result == STR_MENU_STICKS) + else if (result == STR_MENU_STICKS) s_source = MIXSRC_FIRST_STICK; - if (result == STR_MENU_POTS) + else if (result == STR_MENU_POTS) s_source = MIXSRC_FIRST_POT; - if (result == STR_MENU_MAX) + else if (result == STR_MENU_MAX) s_source = MIXSRC_MAX; - if (result == STR_MENU_HELI) + else if (result == STR_MENU_HELI) s_source = MIXSRC_FIRST_HELI; - if (result == STR_MENU_TRIMS) + else if (result == STR_MENU_TRIMS) s_source = MIXSRC_FIRST_TRIM; - if (result == STR_MENU_SWITCHES) + else if (result == STR_MENU_SWITCHES) s_source = MIXSRC_FIRST_SWITCH; - if (result == STR_MENU_TRAINER) + else if (result == STR_MENU_TRAINER) s_source = MIXSRC_FIRST_TRAINER; - if (result == STR_MENU_CHANNELS) + else if (result == STR_MENU_CHANNELS) s_source = getFirstAvailableSource(MIXSRC_FIRST_CH, MIXSRC_LAST_CH, isSourceAvailable); - if (result == STR_MENU_TELEMETRY) { + else if (result == STR_MENU_TELEMETRY) { for (int i = 0; i < TELEM_VALUES_MAX; i++) { TelemetrySensor * sensor = & g_model.telemetrySensors[i]; if (sensor->isAvailable()) { From a966408570aa0a417218324a6d9c0fec0868a05c Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Tue, 24 Mar 2015 10:39:30 +0400 Subject: [PATCH 4/5] Martin's graphics --- radio/src/fonts/std/font_05x07_extra.png | Bin 331 -> 15200 bytes radio/src/translations/cz.h.txt | 14 +++++++------- radio/src/translations/de.h.txt | 14 +++++++------- radio/src/translations/en.h.txt | 14 +++++++------- radio/src/translations/es.h.txt | 12 ++++++------ radio/src/translations/fi.h.txt | 14 +++++++------- radio/src/translations/fr.h.txt | 14 +++++++------- radio/src/translations/it.h.txt | 14 +++++++------- radio/src/translations/pl.h.txt | 14 +++++++------- radio/src/translations/pt.h.txt | 14 +++++++------- radio/src/translations/se.h.txt | 14 +++++++------- 11 files changed, 69 insertions(+), 69 deletions(-) diff --git a/radio/src/fonts/std/font_05x07_extra.png b/radio/src/fonts/std/font_05x07_extra.png index c6f1f39fff0adf572dd3a6cfd9ebc93b672ad0bb..0d75d0b1b217984df3165b284bce4a2df48e2b2d 100644 GIT binary patch literal 15200 zcmeI3e{2(F7{?Du3=A+qOqgi!QbLr?>)o~M+Fsg{u@1IK$Fg;9BO+Yy-fow*clGW{ zy9E*>(Vzy2kmv-&U`!-R0F|Jk#y?Pr5hX|>K_jRUjY@)vKjJT(?_Gc0-nMV1V*KZA z(%wDq^FH6_?(;s++xzDp?CD-LuVGOGMN#v*I-|YtxE_9I&AJx;K6PTrF?g7r=^QdB zYR&@dJA>M_r;(z9pDOV|b1=4AkhHX0l(htK=hGQDo1#L?^BGYZ1ty&U!-^VqU4HFN z7p=%)*MKj^#WL++MClyYLEm_HTpAyhg0gFQq#=|SpgYm-q-36`fsN_&}O*+>){wKDEPbr=b?)q zSEK=+g>*S7^hQ?}(?Kij8Zpg`z_Phq&YknRHGP=ngTWxnd03B!fioCmOf|(kqZ&&J zA|;(DFeF{cn2M&-madr4vS!%jvJ#a)#rsNU%868?$PQ9u^J0eO-5gshNS4YmnXI0& zFHM$MkOFC-ng)#HYsO_pG*dH1v^puv?z)NLn#5w|+%>N^ovxYMFgrFv1VyAZBaQf2 z2C%)r(6YJ&IyS;vSyJonO(j`boGD6{r|z|byizC3@)W}CQYfrY2;QsEt^?83^th&_ zB84jJDIuiW+wH2NZyQilS<4yALM$3mS?`J(h>9kNSoO&8JmYDNdw7B81uxgkwFn&N z5Gl+=G-8^pB*#h`K8Eu$o|ZVz2|O(8R;PwzCaMAZM;1+SS}M-D4jow%lA4|t&4`i~ zhXI>WheK>-&@r=IRYJR#(sX!PAmRIO6OhD!-|tPf%09mhF&1-%S4l@TDQk60QCf!59;hAgiz1UqCO9S# zXz@YmL@UGl{m@AGIX($W(vI*d={33ncRDfUm}6c2-%U|NrYcpZV!-+wbJQ)YUVAU= z1NTfFEjdz(y(eWv-2hg{g>Ggu@)G$; F(5O8E~K!Vow9 zyJeVOAN_-6sJAEmf6Gv*VrfKFhk+bnO9fmSnBK}2)^loSl{SRxP7GOpM*{3(SW%+g zJ$#6*8mnY3%pbJ6F_pFF`#l`|u)OtK40XEE&>?)N(~X8!BKuXvjChLKkYPuZ^`BYT z(EH%y9f-90d|qFOMTgOd9wiS_gHZ+UyoR-(1WPffqh{bxB`{FTWyd+ji*bdOay*CG zEm#g)&1p=U(ZGw#D-wU%IpHy5roeIen9p z7cY65qUo7yUtae>d|8ZcoZFSU{Kna}@16W;G~cl6_ahVMf_r~U9__zb{aWbTEbn}Q zPOXYx61Md&-T&gNyFY6j`Egr@3pM14}}W1qY7J=odS> zj~?18_U}2XpFDW{=ltQfvduTn=s7WQ&7v#KE2IybUSGWF$f?<ai>Jdg z`v+Ekbwgvcd-&wqTbADRdE&bRFP%PrZq2h3+t$6ZKi2qt*Y4-%Jp6uk`}Ns(_qis_ z;3wPXKXQ28LthLWdh&z&-`Vlpv7L`TeYYn!|H9@gcQsA27aqSA-udL@OzOynJDL-J S?AruQs;i?rdT_;t`~Cu|(3v0r delta 319 zcmaD*cACk!Gr-TCmrII^fq{Y7)59eQNZSB02L~IFTq-{2B#>fD@^*J&_z!{$_AZ}1 zQBk~}fxX1j*OmP~GpCS>u}j~vbwFjZnIRD+&iT2ysd*(pE(3#eQEFmIYKlU6W=V#E zyQgnJie4%^P<*|oi(`nz>7${6e60o?+Q)v!@BFueb)$h#jsGN9mAeaMZ}+G$9yn95 z>vG7O>uG71>t|WdeqH%SZimtf@i$^yXMNsQzd}X7CP}v1Cqi^VftFVdQj@c=p2>{o8fAs(W diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d1a5740f6..bb255f023 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1065,17 +1065,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 78bc14793..87e1f55bb 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1064,17 +1064,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 671926bde..53d1a1591 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1064,17 +1064,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index aa401c9be..2e9e89c91 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1000,17 +1000,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" +#define TR_MENU_INPUTS "\314Inputs" #define TR_MENU_LUA "Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\318Channels" +#define TR_MENU_TELEMETRY "\319Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index f8840baf6..b109c2fee 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1000,17 +1000,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index d7a743ac0..0930dab45 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1060,17 +1060,17 @@ #define TR_FILTER "Filtrage" #define TR_TELEMETRYFULL "Plus de capteurs libres!" -#define TR_MENU_INPUTS "Entrées" -#define TR_MENU_LUA "Scripts Lua" +#define TR_MENU_INPUTS "\314Entrées" +#define TR_MENU_LUA "\322Scripts Lua" #define TR_MENU_STICKS "\307Manches" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclique" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclique" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Inters" -#define TR_MENU_TRAINER "Ecolage" -#define TR_MENU_CHANNELS "Canaux" -#define TR_MENU_TELEMETRY "Télémesure" +#define TR_MENU_TRAINER "\317Ecolage" +#define TR_MENU_CHANNELS "\320Canaux" +#define TR_MENU_TELEMETRY "\321Télémesure" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index fca313d46..56a8b27d5 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1000,17 +1000,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 9d6f0de17..f462963fa 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -998,17 +998,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index ed4c5044f..01a2fd704 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1000,17 +1000,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 82bfe4e87..3b9d171fc 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1000,17 +1000,17 @@ #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" -#define TR_MENU_INPUTS "Inputs" -#define TR_MENU_LUA "Lua scripts" +#define TR_MENU_INPUTS "\314Inputs" +#define TR_MENU_LUA "\322Lua scripts" #define TR_MENU_STICKS "\307Sticks" #define TR_MENU_POTS "\310Pots" -#define TR_MENU_MAX "MAX" -#define TR_MENU_HELI "Cyclic" +#define TR_MENU_MAX "\315MAX" +#define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_TRAINER "Trainer" -#define TR_MENU_CHANNELS "Channels" -#define TR_MENU_TELEMETRY "Telemetry" +#define TR_MENU_TRAINER "\317Trainer" +#define TR_MENU_CHANNELS "\320Channels" +#define TR_MENU_TELEMETRY "\321Telemetry" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" From b82e9d54004f43f2161663f68447114e9f44586d Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Tue, 24 Mar 2015 10:54:00 +0400 Subject: [PATCH 5/5] Fix scrollbar --- radio/src/gui/Taranis/popups.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/gui/Taranis/popups.cpp b/radio/src/gui/Taranis/popups.cpp index 895d9c97b..b55afd760 100755 --- a/radio/src/gui/Taranis/popups.cpp +++ b/radio/src/gui/Taranis/popups.cpp @@ -138,7 +138,7 @@ const char * displayMenu(uint8_t event) } if (s_menu_count > display_count) { - displayScrollbar(MENU_X+MENU_W-1, y+1, MENU_MAX_LINES * (FH+1), s_menu_offset, s_menu_count, display_count); + displayScrollbar(MENU_X+MENU_W-1, y+1, MENU_MAX_DISPLAY_LINES * (FH+1), s_menu_offset, s_menu_count, display_count); } switch(event) {