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

[Horus] GUI continued - #3159

Browse Source 
[GVars] Refactoring continued - #3185
This commit is contained in:
Bertrand Songis
2016-01-14 07:41:30 +01:00
parent 43b84385d8
commit e8aaa67450
105 changed files with 4033 additions and 3026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/9x/view_main.cpp
+7 -6
View File
@@ -397,8 +397,8 @@ void menuMainView(uint8_t event)
case EVT_KEY_FIRST(KEY_EXIT):
#if defined(GVARS) && !defined(PCBSTD)
if (s_gvar_timer > 0) {
s_gvar_timer = 0;
if (gvarDisplayTimer > 0) {
gvarDisplayTimer = 0;
}
#endif
if (view == VIEW_TIMER2) {
@@ -555,13 +555,14 @@ void menuMainView(uint8_t event)
}
#if defined(GVARS) && !defined(PCBSTD)
if (s_gvar_timer > 0) {
s_gvar_timer--;
if (gvarDisplayTimer > 0) {
gvarDisplayTimer--;
warningText = STR_GLOBAL_VAR;
displayBox();
lcdDrawSizedText(16, 5*FH, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
lcdDrawSizedText(16, 5*FH, g_model.gvars[gvarLastChanged].name, LEN_GVAR_NAME, ZCHAR);
lcdDrawText(16+7*FW, 5*FH, PSTR("[\010]"), BOLD);
lcdDrawNumber(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
lcdDrawNumber(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(gvarLastChanged, getGVarFlightMode(mixerCurrentFlightMode, gvarLastChanged)), BOLD);
warningText = NULL;
}
#endif