From f6329895a83ed8a50e06d9e07ec57e9466d1aaf0 Mon Sep 17 00:00:00 2001 From: elecpower Date: Thu, 9 Dec 2021 07:33:50 +1100 Subject: [PATCH] Fix compiler warning --- .../src/firmwares/edgetx/yaml_moduledata.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/companion/src/firmwares/edgetx/yaml_moduledata.cpp b/companion/src/firmwares/edgetx/yaml_moduledata.cpp index 9fb1f407e..55d41058f 100644 --- a/companion/src/firmwares/edgetx/yaml_moduledata.cpp +++ b/companion/src/firmwares/edgetx/yaml_moduledata.cpp @@ -27,8 +27,8 @@ // channelsStart: 0 // channelsCount: 12 // failsafeMode: NOT_SET -// mod: -// multi: +// mod: +// multi: // disableTelemetry: 0 // disableMapping: 0 // autoBindMode: 0 @@ -152,17 +152,17 @@ void convertEtxProtocolToMulti(int *protocol, int *subprotocol) //D8 *protocol = 3; *subprotocol = 0; - } + } else if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D8_CLONED) { //D8 *protocol = 3; *subprotocol = 1; - } + } else if (*subprotocol == MM_RF_FRSKY_SUBTYPE_V8) { //V8 *protocol = 25; *subprotocol = 0; - } + } else { *protocol = 15; if (*subprotocol == MM_RF_FRSKY_SUBTYPE_D16_8CH) @@ -260,7 +260,7 @@ Node convert::encode(const ModuleData& rhs) Node pxx2; pxx2["receivers"] = rhs.access.receivers; pxx2["racingMode"] = rhs.access.racingMode; - for (int i=0; i::decode(const Node& node, ModuleData& rhs) node["channelsStart"] >> rhs.channelsStart; node["channelsCount"] >> rhs.channelsCount; node["failsafeMode"] >> failsafeLut >> rhs.failsafeMode; - + if (node["mod"]) { Node mod = node["mod"]; if (mod["ppm"]) { @@ -384,7 +384,7 @@ bool convert::decode(const Node& node, ModuleData& rhs) //TODO } } - + return true; } }