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

fix(color): preview may not work when editing customisable switch colors in radio setup (#6714)

Browse Source
This commit is contained in:
philmoz
2025-10-25 09:20:57 +10:00
committed by GitHub
parent d95bbf1ebd
commit 65bf15f18c
4 changed files with 35 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/hal/rgbleds.cpp
+28 -10
View File
@@ -27,6 +27,14 @@
#if defined(FUNCTION_SWITCHES_RGB_LEDS)
static bool hasLedOverride[NUM_FUNCTIONS_SWITCHES] = { false };
static RGBLedColor ledOverride[NUM_FUNCTIONS_SWITCHES];
static int cfsEditOverride = -1;
static uint32_t cfsEditColor;
void setFSEditOverride(int index, uint32_t color)
{
cfsEditOverride = index;
cfsEditColor = color;
}
void setFSLedOverride(uint8_t index, bool state, uint8_t r, uint8_t g, uint8_t b)
{
@@ -38,21 +46,31 @@ void setFSLedOverride(uint8_t index, bool state, uint8_t r, uint8_t g, uint8_t b
void setFSLedOFF(uint8_t index) {
if (g_model.getSwitchType(index) != SWITCH_NONE) {
uint8_t cfsIdx = switchGetCustomSwitchIdx(index);
if (hasLedOverride[cfsIdx] && g_model.getSwitchOffColorLuaOverride(index))
fsLedRGB(cfsIdx, ledOverride[cfsIdx].getColor());
else
fsLedRGB(cfsIdx, g_model.getSwitchOffColor(index).getColor());
if (cfsEditOverride >= 0) {
uint8_t cfsIdx = switchGetCustomSwitchIdx(cfsEditOverride);
fsLedRGB(cfsIdx, cfsEditColor);
} else {
uint8_t cfsIdx = switchGetCustomSwitchIdx(index);
if (hasLedOverride[cfsIdx] && g_model.getSwitchOffColorLuaOverride(index))
fsLedRGB(cfsIdx, ledOverride[cfsIdx].getColor());
else
fsLedRGB(cfsIdx, g_model.getSwitchOffColor(index).getColor());
}
}
}
void setFSLedON(uint8_t index) {
if (g_model.getSwitchType(index) != SWITCH_NONE) {
uint8_t cfsIdx = switchGetCustomSwitchIdx(index);
if (hasLedOverride[cfsIdx] && g_model.getSwitchOnColorLuaOverride(index))
fsLedRGB(cfsIdx, ledOverride[cfsIdx].getColor());
else
fsLedRGB(cfsIdx, g_model.getSwitchOnColor(index).getColor());
if (cfsEditOverride >= 0) {
uint8_t cfsIdx = switchGetCustomSwitchIdx(cfsEditOverride);
fsLedRGB(cfsIdx, cfsEditColor);
} else {
uint8_t cfsIdx = switchGetCustomSwitchIdx(index);
if (hasLedOverride[cfsIdx] && g_model.getSwitchOnColorLuaOverride(index))
fsLedRGB(cfsIdx, ledOverride[cfsIdx].getColor());
else
fsLedRGB(cfsIdx, g_model.getSwitchOnColor(index).getColor());
}
}
}