Fix YamlSwitchWarningState

This commit is contained in:
elecpower
2021-12-31 10:53:10 +01:00
committed by Raphael Coeffic
parent d3e619cec4
commit 3809c1d0ff
@@ -170,7 +170,7 @@ struct YamlSwitchWarningState {
const char *sw = tag.data(); const char *sw = tag.data();
if (tag.size() >= 2 && sw[0] == 'S') { if (tag.size() >= 2 && sw[0] == 'S') {
char val[2]; char val[3];
val[0] = sw[1]; val[0] = sw[1];
uint64_t value = (i == 0 ? states & 0x3 : states & 0x1); uint64_t value = (i == 0 ? states & 0x3 : states & 0x1);
@@ -181,6 +181,7 @@ struct YamlSwitchWarningState {
val[1] = '-'; val[1] = '-';
else else
val[1] = 'd'; val[1] = 'd';
val[2] = '\0';
src_str.append(val); src_str.append(val);
} }
@@ -202,9 +203,10 @@ struct YamlSwitchWarningState {
int shift = 0; int shift = 0;
uint64_t mask; uint64_t mask;
char sw[2]; char sw[3];
sw[0] = 'S'; sw[0] = 'S';
sw[1] = val[0]; sw[1] = val[0];
sw[2] = '\0';
int index = getCurrentFirmware()->getSwitchesIndex(sw); int index = getCurrentFirmware()->getSwitchesIndex(sw);
@@ -934,9 +936,9 @@ bool convert<ModelData>::decode(const Node& node, ModelData& rhs)
vario["centerMax"] >> rhs.frsky.varioCenterMax; vario["centerMax"] >> rhs.frsky.varioCenterMax;
vario["centerMin"] >> rhs.frsky.varioCenterMin; vario["centerMin"] >> rhs.frsky.varioCenterMin;
vario["min"] >> rhs.frsky.varioMin; vario["min"] >> rhs.frsky.varioMin;
vario["max"] >> rhs.frsky.varioMax; vario["max"] >> rhs.frsky.varioMax;
} }
if (node["rssiSource"]) { if (node["rssiSource"]) {
YamlTelemSource rssiSource; YamlTelemSource rssiSource;
node["rssiSource"] >> rssiSource; node["rssiSource"] >> rssiSource;