From 4417fb2bb80b12d8a96bca49842960dc03a57701 Mon Sep 17 00:00:00 2001 From: Peter Feerick Date: Wed, 8 Nov 2023 18:34:32 +1000 Subject: [PATCH] fix(color): Toggle switch not valid for pre-start checks (#4293) --- radio/src/gui/colorlcd/preflight_checks.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/radio/src/gui/colorlcd/preflight_checks.cpp b/radio/src/gui/colorlcd/preflight_checks.cpp index b3353dfee..5d7c40faf 100644 --- a/radio/src/gui/colorlcd/preflight_checks.cpp +++ b/radio/src/gui/colorlcd/preflight_checks.cpp @@ -201,15 +201,15 @@ static std::string switchWarninglabel(swsrc_t index) #define SW_BTN_W ((LCD_W-24)/SW_BTNS) SwitchWarnMatrix::SwitchWarnMatrix(Window* parent, const rect_t& r) : - ButtonMatrix(parent, r) + ButtonMatrix(parent, r) { // Setup button layout & texts uint8_t btn_cnt = 0; for (uint8_t i = 0; i < MAX_SWITCHES; i++) { - if (SWITCH_EXISTS(i)) { + if (SWITCH_WARNING_ALLOWED(i)) { sw_idx[btn_cnt] = i; btn_cnt++; - } + } } initBtnMap(SW_BTNS, btn_cnt); @@ -217,7 +217,7 @@ SwitchWarnMatrix::SwitchWarnMatrix(Window* parent, const rect_t& r) : uint8_t btn_id = 0; for (uint8_t i = 0; i < MAX_SWITCHES; i++) { - if (SWITCH_EXISTS(i)) { + if (SWITCH_WARNING_ALLOWED(i)) { setTextAndState(btn_id); btn_id++; }