From 38118acba6d1b73ff75187665881c4991ea36925 Mon Sep 17 00:00:00 2001 From: philmoz Date: Wed, 17 Sep 2025 11:53:50 +1000 Subject: [PATCH] fix(color): source picker may show invalid switches (#6590) --- radio/src/boards/generic_stm32/switches.cpp | 2 +- radio/src/targets/simu/switch_driver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/boards/generic_stm32/switches.cpp b/radio/src/boards/generic_stm32/switches.cpp index c9ef2a24a..c748ba99e 100644 --- a/radio/src/boards/generic_stm32/switches.cpp +++ b/radio/src/boards/generic_stm32/switches.cpp @@ -59,7 +59,7 @@ const stm32_switch_t* boardGetSwitchDef(uint8_t idx) { return &_switch_defs[idx] uint8_t boardGetMaxSwitches() { return n_switches; } #if defined(FUNCTION_SWITCHES) -bool boardIsCustomSwitch(uint8_t idx) { return _switch_defs[idx].isCustomSwitch; } +bool boardIsCustomSwitch(uint8_t idx) { return (idx < n_switches) ? _switch_defs[idx].isCustomSwitch : false; } uint8_t boardGetCustomSwitchIdx(uint8_t idx) { return _switch_defs[idx].customSwitchIdx; } #endif diff --git a/radio/src/targets/simu/switch_driver.cpp b/radio/src/targets/simu/switch_driver.cpp index b1a03134d..73b08842c 100644 --- a/radio/src/targets/simu/switch_driver.cpp +++ b/radio/src/targets/simu/switch_driver.cpp @@ -77,7 +77,7 @@ uint8_t boardGetMaxSwitches() { return n_switches; } SwitchConfig boardSwitchGetDefaultConfig(uint8_t idx) { return _switch_defs[idx].defaultType; } #if defined(FUNCTION_SWITCHES) -bool boardIsCustomSwitch(uint8_t idx) { return _switch_defs[idx].isCustomSwitch; } +bool boardIsCustomSwitch(uint8_t idx) { return (idx < n_switches) ? _switch_defs[idx].isCustomSwitch : false; } uint8_t boardGetCustomSwitchIdx(uint8_t idx) { return _switch_defs[idx].customSwitchIdx; } #endif