From b8654487526dfbf72eb4eb257c984aa213f895b0 Mon Sep 17 00:00:00 2001 From: Neil Horne Date: Sun, 30 Jan 2022 16:14:33 +1100 Subject: [PATCH] fix: Telemetry "Ignore instances" option being unset by Companion (#1525) --- companion/src/firmwares/edgetx/yaml_modeldata.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/companion/src/firmwares/edgetx/yaml_modeldata.cpp b/companion/src/firmwares/edgetx/yaml_modeldata.cpp index 24f9d94d5..36562c88d 100644 --- a/companion/src/firmwares/edgetx/yaml_modeldata.cpp +++ b/companion/src/firmwares/edgetx/yaml_modeldata.cpp @@ -735,6 +735,7 @@ Node convert::encode(const ModelData& rhs) node["thrTrim"] = (int)rhs.thrTrim; node["trimInc"] = rhs.trimInc; node["displayTrims"] = rhs.trimsDisplay; + node["ignoreSensorIds"] = (int)rhs.frsky.ignoreSensorIds; node["disableThrottleWarning"] = (int)rhs.disableThrottleWarning; node["enableCustomThrottleWarning"] = (int)rhs.enableCustomThrottleWarning; node["customThrottleWarningPosition"] = (int)rhs.customThrottleWarningPosition; @@ -885,7 +886,7 @@ Node convert::encode(const ModelData& rhs) node["failsafeChannels"][std::to_string(i)]["val"] = rhs.limitData[i].failsafe; } } - + for (int i=0; i 0) { node["scriptData"][std::to_string(i)] = rhs.scriptData[i]; @@ -962,6 +963,7 @@ bool convert::decode(const Node& node, ModelData& rhs) node["thrTrim"] >> rhs.thrTrim; node["trimInc"] >> rhs.trimInc; node["displayTrims"] >> rhs.trimsDisplay; + node["ignoreSensorIds"] >> rhs.frsky.ignoreSensorIds; node["disableThrottleWarning"] >> rhs.disableThrottleWarning; node["enableCustomThrottleWarning"] >> rhs.enableCustomThrottleWarning; node["customThrottleWarningPosition"] >> rhs.customThrottleWarningPosition;