Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-18 22:05:10 +03:00
Code Issues Wiki Activity

Merge remote-tracking branch 'origin/next' into

Browse source 
bsongis/vario_improvements

Conflicts:
	radio/src/maths.cpp
This commit is contained in:
Bertrand Songis 2014-02-21 07:13:33 +01:00
commit 903dc152a5
415 changed files with 48952 additions and 9887 deletions
Download patch file Download diff file Expand all files Collapse all files

6
radio/src/gui/menu_model.cpp
View file

@ -5181,7 +5181,7 @@ void menuModelCustomScriptOne(uint8_t event)
if (i == ITEM_MODEL_CUSTOMSCRIPT_FILE) {
lcd_putsLeft(y, "Script");
if (ZEXIST(sd.file) > 0)
if (ZEXIST(sd.file))
lcd_putsnAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, sd.file, sizeof(sd.file), attr);
else
lcd_putsiAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, STR_VCSWFUNC, 0, attr);
@ -5669,7 +5669,7 @@ void menuModelTelemetry(uint8_t event)
putsStrIdx(0*FW, y, STR_SCREEN, screenIndex+1);
#if defined(GAUGES)
bool screenType = IS_BARS_SCREEN(screenIndex);
if (screenType != selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VSCREEN, screenType, 0, 1, attr, event))
if (screenType != (bool)selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VSCREEN, screenType, 0, 1, attr, event))
g_model.frsky.screensType ^= (1 << screenIndex);
#endif
break;
@ -5680,7 +5680,7 @@ void menuModelTelemetry(uint8_t event)
putsStrIdx(0*FW, y, STR_SCREEN, screenIndex);
#if defined(GAUGES)
bool screenType = g_model.frsky.screensType & screenIndex;
if (screenType != selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VSCREEN, screenType, 0, 1, attr, event))
if (screenType != (bool)selectMenuItem(TELEM_SCRTYPE_COL, y, PSTR(""), STR_VSCREEN, screenType, 0, 1, attr, event))
g_model.frsky.screensType ^= screenIndex;
#endif
break;