Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 08:15:17 +03:00
Code Issues Wiki Activity

Just before reverting ...

Browse source
This commit is contained in:
bsongis 2011-10-08 08:28:43 +00:00
parent b91b63615c
commit ac45e5bfac
8 changed files with 266 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main_views.cpp
View file

@ -53,9 +53,11 @@ void menuMainView(uint8_t event)
uint8_t view = (switchView == 255 ? g_eeGeneral.view : switchView);
#ifdef FRSKY
bool telemViewSw = isFunctionActive(FUNC_VIEW_TELEMETRY);
if (switchView == 255 && telemViewSw) { view = switchView = e_telemetry + ALTERNATE; }
if (switchView != 255 && !telemViewSw) { view = g_eeGeneral.view; switchView = 255; }
#endif
uint8_t view_base = view & 0x0f;
@ -154,6 +156,7 @@ void menuMainView(uint8_t event)
if (!instantTrimSwLock && trimSw) instantTrim();
instantTrimSwLock = trimSw;
#ifdef FRSKY
if (view_base == e_telemetry && view > ALTERNATE) {
putsModelName(0, 0, g_model.name, g_eeGeneral.currModel, 0);
uint8_t att = (g_vbat100mV < g_eeGeneral.vBatWarn ? BLINK : 0);
@ -164,7 +167,9 @@ void menuMainView(uint8_t event)
}
lcd_filled_rect(0, 0, DISPLAY_W, 8);
}
else {
else
#endif
{
uint8_t phase = getFlightPhase();
lcd_putsnAtt(6*FW+2, 2*FH, g_model.phaseData[phase].name, sizeof(g_model.phaseData[phase].name), ZCHAR);