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

Switch warnings on stock again

Browse Source
This commit is contained in:
Andre Bernet
2014-02-01 14:55:10 +01:00
parent fcce76cfa4
commit 3a5b41ae54
2 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/opentx.cpp
+17 -10
View File
@@ -2258,12 +2258,15 @@ void checkSwitches()
}
}
#else
uint8_t nSwWarn = g_model.nSwToWarn;
nSwWarn=(nSwWarn<<1)|(nSwWarn&1); // duplicate first bit because states has first two bits for ID, but nSwToWarn has only one
for (uint8_t i=0; i<NUM_PSWITCH-2; i++) {
if (!(nSwWarn & (1<<i)))
if((states & (1<<i)) != (switches_states & (1<<i)))
for (uint8_t i=0; i<NUM_SWITCHES; i++) {
if (!(g_model.nSwToWarn & (1<<i))) {
if (i == 0) {
if((states & 0x03) != (switches_states & 0x03))
warn = true;
}
else if((states & (1<<i+1)) != (switches_states & (1<<i+1)))
warn = true;
}
}
#endif
@@ -2308,11 +2311,15 @@ void checkSwitches()
if (last_bad_switches != switches_states) {
MESSAGE(STR_SWITCHWARN, NULL, STR_PRESSANYKEYTOSKIP, last_bad_switches == 0xff ? AU_SWITCH_ALERT : AU_NONE);
uint8_t x = 2;
for (uint8_t i=1; i<NUM_PSWITCH-1; i++) {
uint8_t attr = (states & (1 << (i-1))) == (switches_states & (1 << (i-1))) ? 0 : INVERS;
if(!(nSwWarn & (1<<(i-1)))) putsSwitches(x, 5*FH, (i>2?(i+1):1+(states&0x3)), attr);
if (i == 1 && attr) i++;
if (i != 1) x += 3*FW+FW/2;
for (uint8_t i=0; i<NUM_SWITCHES; i++) {
uint8_t attr;
if (i == 0)
attr = ((states & 0x03) != (switches_states & 0x03)) ? INVERS : 0;
else
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):(switches_states&0x3)+1), attr);
x += 3*FW+FW/2;
}
#endif
lcdRefresh();
radio/src/translations/en.h
+1 -1
View File
@@ -485,7 +485,7 @@
#define TR_BLOFFBRIGHTNESS INDENT"OFF Brightness"
#define TR_SPLASHSCREEN "Splash screen"
#define TR_THROTTLEWARNING TR("T-Warning","Throttle Warning")
#define TR_SWITCHWARNING TR("C-Warning","Control Warning")
#define TR_SWITCHWARNING TR("S-Warning","Switch Warning")
#define TR_POTWARNING TR("Pot Warn.","Pot Warning")
#define TR_TIMEZONE TR("Time Zone","GPS Time zone")
#define TR_RXCHANNELORD TR("Rx Channel Ord","Default channel order")