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

fix: Companion not correctly reading/writing trainer settings (#1560)

Browse Source
This commit is contained in:
Neil Horne
2022-02-06 11:22:07 +10:00
committed by GitHub
parent a156fc4515
commit e94730afc4
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_modeldata.cpp
+20 -2
View File
@@ -873,7 +873,6 @@ Node convert<ModelData>::encode(const ModelData& rhs)
}
node["rssiAlarms"] = rhs.rssiAlarms;
node["trainerMode"] = trainerModeLut << rhs.trainerMode;
for (int i=0; i<CPN_MAX_MODULES; i++) {
if (rhs.moduleData[i].protocol != PULSES_OFF) {
@@ -887,6 +886,13 @@ Node convert<ModelData>::encode(const ModelData& rhs)
}
}
node["trainerData"]["mode"] = trainerModeLut << rhs.trainerMode;
node["trainerData"]["channelsStart"] = rhs.moduleData[2].channelsStart;
node["trainerData"]["channelsCount"] = (rhs.moduleData[2].channelsCount - 8);
node["trainerData"]["frameLength"] = rhs.moduleData[2].ppm.frameLength;
node["trainerData"]["delay"] = ((rhs.moduleData[2].ppm.delay - 300) / 50);
node["trainerData"]["pulsePol"] = (int)rhs.moduleData[2].ppm.pulsePol;
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];
@@ -1057,7 +1063,6 @@ bool convert<ModelData>::decode(const Node& node, ModelData& rhs)
}
node["rssiAlarms"] >> rhs.rssiAlarms;
node["trainerMode"] >> trainerModeLut >> rhs.trainerMode;
node["moduleData"] >> rhs.moduleData;
for (int i=0; i<CPN_MAX_MODULES; i++) {
@@ -1073,6 +1078,19 @@ bool convert<ModelData>::decode(const Node& node, ModelData& rhs)
}
}
if (node["trainerData"]) {
const auto& trainer = node["trainerData"];
if (!trainer.IsMap()) return false;
trainer["mode"] >> trainerModeLut >> rhs.trainerMode;
trainer["channelsStart"] >> rhs.moduleData[2].channelsStart;
trainer["channelsCount"] >> rhs.moduleData[2].channelsCount;
rhs.moduleData[2].channelsCount += 8;
trainer["frameLength"] >> rhs.moduleData[2].ppm.frameLength;
trainer["delay"] >> rhs.moduleData[2].ppm.delay;
rhs.moduleData[2].ppm.delay = 300 + 50 * rhs.moduleData[2].ppm.delay;
trainer["pulsePol"] >> rhs.moduleData[2].ppm.pulsePol;
}
node["scriptData"] >> rhs.scriptData;
node["telemetrySensors"] >> rhs.sensorData;