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

Fix constant string, remove warning

Browse Source
This commit is contained in:
Andre Bernet
2014-02-03 17:42:38 +01:00
parent 28e9d0ee94
commit 62ad79538f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/menu_model.cpp
+2 -2
View File
@@ -1201,7 +1201,7 @@ void menuModelSetup(uint8_t event)
c = "\300-\301"[states & 0x03];
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*(2*FW), y, 'A'+i, line && (m_posHorz == i) ? INVERS : 0);
if(swactive) lcd_putc(MODEL_SETUP_2ND_COLUMN+i*(2*FW)+FWNUM, y, c);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+2), y, "<]", (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+((NUM_SWITCHES-1)*2*FW+2), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
states >>= 2;
#else
attr = 0;
@@ -1223,7 +1223,7 @@ void menuModelSetup(uint8_t event)
}
lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr);
#if !defined(CPUM64)
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, "<]", (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
lcd_putsAtt(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, PSTR("<]"), (m_posHorz == NUM_SWITCHES-1 && !s_noHi) ? line : 0);
#endif
#endif
}
radio/src/opentx.cpp
+2 -2
View File
@@ -2264,7 +2264,7 @@ void checkSwitches()
if((states & 0x03) != (switches_states & 0x03))
warn = true;
}
else if((states & (1<<i+1)) != (switches_states & (1<<i+1)))
else if((states & (1<<(i+1))) != (switches_states & (1<<(i+1))))
warn = true;
}
}
@@ -2316,7 +2316,7 @@ void checkSwitches()
if (i == 0)
attr = ((states & 0x03) != (switches_states & 0x03)) ? INVERS : 0;
else
attr = (states & (1 << i+1)) == (switches_states & (1 << i+1)) ? 0 : INVERS;
attr = (states & (1 << (i+1))) == (switches_states & (1 << (i+1))) ? 0 : INVERS;
if(!(g_model.nSwToWarn & (1<<i)))
putsSwitches(x, 5*FH, (i>0?(i+3):(states&0x3)+1), attr);
x += 3*FW+FW/2;