From e033da999cfd87fa554cde28044ebe16e81023d6 Mon Sep 17 00:00:00 2001 From: Neil Horne <15316949+elecpower@users.noreply.github.com> Date: Mon, 27 May 2024 19:07:28 +1000 Subject: [PATCH] fix(cpn): global functions yaml decode (#5072) --- companion/src/firmwares/edgetx/yaml_generalsettings.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp index e31afc999..bd8b61fde 100644 --- a/companion/src/firmwares/edgetx/yaml_generalsettings.cpp +++ b/companion/src/firmwares/edgetx/yaml_generalsettings.cpp @@ -555,7 +555,11 @@ bool convert::decode(const Node& node, GeneralSettings& rhs) node["pwrOnSpeed"] >> rhs.pwrOnSpeed; node["pwrOffSpeed"] >> rhs.pwrOffSpeed; - node["customFn"] >> rhs.customFn; + if (node["customFn"]) { + // decode common for radio GF and model SF and conversion test assumes decoding a model + modelSettingsVersion = radioSettingsVersion; + node["customFn"] >> rhs.customFn; + } // the GeneralSettings struct is initialised to hardware definition defaults which is fine for new settings // however when parsing saved settings set all inputs to None and override with parsed values