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

New UI merged

Browse Source
This commit is contained in:
Bertrand Songis
2019-08-28 20:50:14 +02:00
parent 1f41076b0e
commit f4f8893ae9
806 changed files with 30836 additions and 11704 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/switches.cpp
+12 -9
View File
@@ -22,7 +22,7 @@
#define CS_LAST_VALUE_INIT -32768
#if defined(PCBHORUS)
#if defined(COLORLCD)
#define SWITCH_WARNING_LIST_X WARNING_LINE_X
#define SWITCH_WARNING_LIST_Y WARNING_LINE_Y+3*FH
#elif LCD_W >= 212
@@ -56,7 +56,7 @@ LogicalSwitchesFlightModeContext lswFm[MAX_FLIGHT_MODES];
#define LS_LAST_VALUE(fm, idx) lswFm[fm].lsw[idx].lastValue
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
#if defined(PCBX9E)
tmr10ms_t switchesMidposStart[16];
#else
@@ -421,7 +421,7 @@ bool getSwitch(swsrc_t swtch, uint8_t flags)
}
#endif
else if (cs_idx <= SWSRC_LAST_SWITCH) {
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
if (flags & GETSWITCH_MIDPOS_DELAY)
result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH);
else
@@ -495,7 +495,7 @@ swsrc_t getMovedSwitch()
static tmr10ms_t s_move_last_time = 0;
swsrc_t result = 0;
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
for (int i=0; i<NUM_SWITCHES; i++) {
if (SWITCH_EXISTS(i)) {
swarnstate_t mask = ((swarnstate_t)0x03 << (i*2));
@@ -536,12 +536,15 @@ swsrc_t getMovedSwitch()
}
#if defined(GUI)
#if defined(COLORLCD)
#warning "TODO checkSwitches not implemented"
#endif
void checkSwitches()
{
swarnstate_t last_bad_switches = 0xff;
swarnstate_t states = g_model.switchWarningState;
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
uint8_t bad_pots = 0, last_bad_pots = 0xff;
#endif
@@ -551,7 +554,7 @@ void checkSwitches()
while (1) {
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY)
#define GETADC_COUNT 1
#endif
@@ -632,7 +635,7 @@ void checkSwitches()
backlightOn();
// first - display warning
#if defined(PCBTARANIS) || defined(PCBHORUS)
#if defined(PCBFRSKY) || defined(PCBFLYSKY)
if (last_bad_switches != switches_states || last_bad_pots != bad_pots) {
drawAlertBox(STR_SWITCHWARN, nullptr, STR_PRESSANYKEYTOSKIP);
if (last_bad_switches == 0xff || last_bad_pots == 0xff) {
@@ -648,8 +651,8 @@ void checkSwitches()
if (state && state-1 != ((switches_states >> (i*2)) & 0x03)) {
if (++numWarnings < 6) {
// LcdFlags attr = ((states & mask) == (switches_states & mask)) ? TEXT_COLOR : ALARM_COLOR;
LcdFlags attr = ALARM_COLOR;
drawSwitch(x, y, SWSRC_FIRST_SWITCH+i*3+state-1, attr);
// LcdFlags attr = ALARM_COLOR;
// drawSwitch(x, y, SWSRC_FIRST_SWITCH+i*3+state-1, attr);
x += 35;
}
}