From 7e2271905ee827d7d3d893638242d48c8750caa1 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 5 Feb 2017 13:06:53 +0100 Subject: [PATCH 1/2] Fix switch warning setup on X7 --- radio/src/gui/128x64/model_setup.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index edeebbc5d..332fdbbbc 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -519,7 +519,11 @@ void menuModelSetup(event_t event) if (swactive) attr |= INVERS; } +#if defined(CPUARM) + lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive) ? c : '-', attr); +#else lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive || (attr & BLINK)) ? c : '-', attr); +#endif #if !defined(CPUM64) lcdDrawText(MODEL_SETUP_2ND_COLUMN+(NUM_SWITCHES*FW), y, PSTR("<]"), (menuHorizontalPosition == NUM_SWITCHES-1 && !NO_HIGHLIGHT()) ? line : 0); #endif From 08989fb7458b2b6684a13f4577d4bc4135eac53d Mon Sep 17 00:00:00 2001 From: 3djc Date: Sun, 5 Feb 2017 13:21:00 +0100 Subject: [PATCH 2/2] Another option --- radio/src/gui/128x64/model_setup.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/model_setup.cpp b/radio/src/gui/128x64/model_setup.cpp index 332fdbbbc..cdc58ede8 100644 --- a/radio/src/gui/128x64/model_setup.cpp +++ b/radio/src/gui/128x64/model_setup.cpp @@ -515,9 +515,7 @@ void menuModelSetup(event_t event) states >>= 1; } if (line && (menuHorizontalPosition == i)) { - attr = BLINK; - if (swactive) - attr |= INVERS; + attr = BLINK | INVERS; } #if defined(CPUARM) lcdDrawChar(MODEL_SETUP_2ND_COLUMN+i*FW, y, (swactive) ? c : '-', attr);