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

Badly displayed fields in Trainer Screen (thanks gbirkus!)

Browse source 
InstantTrim should work also in Telemetry View
Trims2Offsets function ok with Flight Phases
New Makefile option EEPROM_PROGRESS_BAR
Many flash savings ...
This commit is contained in:
bsongis 2012-03-28 17:01:58 +00:00
parent c63c467182
commit 9c16acb445
14 changed files with 215 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main_views.cpp
View file

@ -74,8 +74,6 @@ void doMainScreenGrphics()
void menuMainView(uint8_t event)
{
static bool instantTrimSwLock;
uint8_t view = g_eeGeneral.view;
uint8_t view_base = view & 0x0f;
@ -163,7 +161,6 @@ void menuMainView(uint8_t event)
killEvents(KEY_EXIT);
killEvents(KEY_UP);
killEvents(KEY_DOWN);
instantTrimSwLock = true;
break;
#ifdef NAVIGATION_RE1
case EVT_KEY_LONG(BTN_RE1):
@ -180,10 +177,6 @@ void menuMainView(uint8_t event)
#endif
}
bool trimSw = isFunctionActive(FUNC_INSTANT_TRIM);
if (!instantTrimSwLock && trimSw) instantTrim();
instantTrimSwLock = trimSw;
{
uint8_t phase = getFlightPhase();
lcd_putsnAtt(6*FW+2, 2*FH, g_model.phaseData[phase].name, sizeof(g_model.phaseData[phase].name), ZCHAR);
@ -210,7 +203,7 @@ void menuMainView(uint8_t event)
xm = x[CONVERT_MODE(i+1)-1];
uint8_t att = ROUND;
int16_t val = getTrimValue(getTrimFlightPhase(i, phase), i);
int16_t val = getTrimValue(phase, i);
if (val < -125 || val > 125)
att = BLINK|INVERS|ROUND;