From 564956894faf7d8e232800051deb927076607c54 Mon Sep 17 00:00:00 2001 From: philmoz Date: Tue, 21 Oct 2025 21:50:11 +1100 Subject: [PATCH] fix(firmware): incorrect conversion of custom switch settings in older YAML files (#6696) --- radio/src/storage/yaml/yaml_datastructs_funcs.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp index 4dc05da5b..65dd9fa92 100644 --- a/radio/src/storage/yaml/yaml_datastructs_funcs.cpp +++ b/radio/src/storage/yaml/yaml_datastructs_funcs.cpp @@ -2443,11 +2443,17 @@ static const struct YamlNode struct_cfsGroupOn[] { YAML_END, }; +#if NUM_FUNCTIION_SWITCHES > 6 +#define NUM_CFS_FOR_CONVERSION 6 +#else +#define NUM_CFS_FOR_CONVERSION NUM_FUNCTIONS_SWITCHES +#endif + static void r_functionSwitchConfig(void* user, uint8_t* data, uint32_t bitoffs, const char* val, uint8_t val_len) { uint32_t v = yaml_str2uint(val, val_len); - for (int i = 0; i < 6; i += 1) { + for (int i = 0; i < NUM_CFS_FOR_CONVERSION; i += 1) { g_model.customSwitches[i].type = (SwitchConfig)bfGet(v, 2 * i, 2); } } @@ -2456,7 +2462,7 @@ static void r_functionSwitchStartConfig(void* user, uint8_t* data, uint32_t bito const char* val, uint8_t val_len) { uint32_t v = yaml_str2uint(val, val_len); - for (int i = 0; i < 6; i += 1) { + for (int i = 0; i < NUM_CFS_FOR_CONVERSION; i += 1) { uint8_t b = bfGet(v, 2 * i, 2); if (b < 2) b ^= 1; // Swap On & Off g_model.customSwitches[i].start = (fsStartPositionType)b; @@ -2467,7 +2473,7 @@ static void r_functionSwitchGroup(void* user, uint8_t* data, uint32_t bitoffs, const char* val, uint8_t val_len) { uint32_t v = yaml_str2uint(val, val_len); - for (int i = 0; i < 6; i += 1) { + for (int i = 0; i < NUM_CFS_FOR_CONVERSION; i += 1) { g_model.customSwitches[i].group = bfGet(v, 2 * i, 2); } for (int i = 0; i <= 3; i += 1) { @@ -2479,7 +2485,7 @@ static void r_functionSwitchLogicalState(void* user, uint8_t* data, uint32_t bit const char* val, uint8_t val_len) { uint32_t v = yaml_str2uint(val, val_len); - for (int i = 0; i < 6; i += 1) { + for (int i = 0; i < NUM_CFS_FOR_CONVERSION; i += 1) { g_model.customSwitches[i].state = bfGet(v, 1 * i, 1); } }