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

fix: Telemetry "Ignore instances" option being unset by Companion (#1525)

Browse Source
This commit is contained in:
Neil Horne
2022-01-30 15:14:33 +10:00
committed by GitHub
parent bf931a5097
commit b865448752
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_modeldata.cpp
+3 -1
View File
@@ -735,6 +735,7 @@ Node convert<ModelData>::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<ModelData>::encode(const ModelData& rhs)
node["failsafeChannels"][std::to_string(i)]["val"] = rhs.limitData[i].failsafe;
}
}
for (int i=0; i<CPN_MAX_SCRIPTS; i++) {
if (strlen(rhs.scriptData[i].filename) > 0) {
node["scriptData"][std::to_string(i)] = rhs.scriptData[i];
@@ -962,6 +963,7 @@ bool convert<ModelData>::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;