Companion save serial port settings even if OFF

This commit is contained in:
elecpower
2022-04-24 08:32:45 +10:00
parent fa5b718579
commit dfd4c5a56a
@@ -214,7 +214,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
Node serialPort; Node serialPort;
for (int i = 0; i < GeneralSettings::SP_COUNT; i++) { for (int i = 0; i < GeneralSettings::SP_COUNT; i++) {
if (rhs.serialPort[i] != GeneralSettings::AUX_SERIAL_OFF) { if (rhs.serialPort[i] != GeneralSettings::AUX_SERIAL_OFF || rhs.serialPower[i]) {
Node mode = uartModeLut << rhs.serialPort[i]; Node mode = uartModeLut << rhs.serialPort[i];
serialPort[LookupValue(serialPortLut, i)]["mode"] = mode; serialPort[LookupValue(serialPortLut, i)]["mode"] = mode;
serialPort[LookupValue(serialPortLut, i)]["power"] = (int)rhs.serialPower[i]; serialPort[LookupValue(serialPortLut, i)]["power"] = (int)rhs.serialPower[i];
@@ -405,11 +405,13 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["varioRepeat"] >> rhs.varioRepeat; node["varioRepeat"] >> rhs.varioRepeat;
node["backgroundVolume"] >> ioffset_int(rhs.backgroundVolume, 2); node["backgroundVolume"] >> ioffset_int(rhs.backgroundVolume, 2);
// depreciated v2.7 replaced by serialPort
if (node["auxSerialMode"]) { if (node["auxSerialMode"]) {
node["auxSerialMode"] >> oldUartModeLut >> node["auxSerialMode"] >> oldUartModeLut >>
rhs.serialPort[GeneralSettings::SP_AUX1]; rhs.serialPort[GeneralSettings::SP_AUX1];
} }
// depreciated v2.7 replaced by serialPort
if (node["aux2SerialMode"]) { if (node["aux2SerialMode"]) {
node["aux2SerialMode"] >> oldUartModeLut >> node["aux2SerialMode"] >> oldUartModeLut >>
rhs.serialPort[GeneralSettings::SP_AUX2]; rhs.serialPort[GeneralSettings::SP_AUX2];
@@ -424,9 +426,15 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
int p = port_nr.as<int>(); int p = port_nr.as<int>();
if (p >= 0 && p < GeneralSettings::SP_COUNT && port.second.IsMap()) { if (p >= 0 && p < GeneralSettings::SP_COUNT && port.second.IsMap()) {
port.second["mode"] >> uartModeLut >> rhs.serialPort[p]; port.second["mode"] >> uartModeLut >> rhs.serialPort[p];
int pwr = port.second["power"].as<int>(); // introduced v2.8
if (pwr >= 0 && pwr <= 1) Node port_pwr = port.second["power"];
port.second["power"] >> rhs.serialPower[p]; if (port_pwr && port_pwr.IsScalar()) {
try {
int pwr = port_pwr.as<int>();
if (pwr == 0 || pwr == 1)
rhs.serialPower[p] = pwr;
} catch(...) {}
}
} }
} }
} }