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

Fix switch indexes (#1362)

Browse Source 
Resolves #1353
This commit is contained in:
Raphael Coeffic
2022-01-07 10:31:37 +10:00
committed by GitHub
parent c7e7443c30
commit d97afb6f8e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_rawsource.cpp
+3 -4
View File
@@ -45,8 +45,7 @@ std::string YamlRawSourceEncode(const RawSource& rhs)
src_str += "MAX";
break;
case SOURCE_TYPE_SWITCH:
src_str += "S";
src_str += (rhs.index + 'A');
src_str += getCurrentFirmware()->getSwitchesTag(rhs.index);
break;
case SOURCE_TYPE_CUSTOM_SWITCH:
src_str += "ls(";
@@ -114,8 +113,8 @@ RawSource YamlRawSourceDecode(const std::string& src_str)
&& val[1] >= 'A'
&& val[1] <= 'Z') {
int idx = val[1] - 'A';
if (idx < CPN_MAX_SWITCHES)
int idx = getCurrentFirmware()->getSwitchesIndex(src_str.c_str());
if (idx >= 0 && idx < CPN_MAX_SWITCHES)
rhs = RawSource(SOURCE_TYPE_SWITCH, idx);
} else if (val_len > 4 &&