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

Merge remote-tracking branch 'origin/next' into

Browse Source 
bsongis/spare_values_in_telemetry_and_functions

Conflicts:
	radio/src/translations/fr.h.txt
This commit is contained in:
bsongis
2014-02-28 12:22:59 +01:00
parent f250d381e5 d6fefe71c0
commit da41f43ff4
39 changed files with 293 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/menu_model.cpp
+3 -3
View File
@@ -4254,7 +4254,7 @@ enum LogicalSwitchFields {
void menuModelLogicalSwitchOne(uint8_t event)
{
TITLE(STR_MENUCUSTOMSWITCH);
TITLE(STR_MENULOGICALSWITCH);
LogicalSwitchData * cs = cswAddress(s_currIdx);
uint8_t sw = SWSRC_SW1+s_currIdx;
@@ -4398,7 +4398,7 @@ void menuModelLogicalSwitchOne(uint8_t event)
void menuModelLogicalSwitches(uint8_t event)
{
SIMPLE_MENU(STR_MENUCUSTOMSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1);
SIMPLE_MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1);
uint8_t y = 0;
uint8_t k = 0;
@@ -4516,7 +4516,7 @@ void menuModelLogicalSwitches(uint8_t event)
{
INCDEC_DECLARE_VARS();
MENU(STR_MENUCUSTOMSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/});
MENU(STR_MENULOGICALSWITCHES, menuTabModel, e_LogicalSwitches, NUM_CSW+1, {0, NAVIGATION_LINE_BY_LINE|LS_FIELD_LAST/*repeated...*/});
uint8_t y = 0;
uint8_t k = 0;