jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-10 18:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: added ID validation for opentherm response

Browse Source
This commit is contained in:
Yurii
2024-10-27 04:33:46 +03:00
parent f62e687d3f
commit 11b1277d79
2 changed files with 75 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CustomOpenTherm/CustomOpenTherm.h
View File

@@ -105,7 +105,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::TSet);
}
bool setHeatingCh2Temp(float temperature) {
@@ -115,7 +115,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::TsetCH2);
}
bool setDhwTemp(float temperature) {
@@ -125,7 +125,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::TdhwSet);
}
bool setRoomSetpoint(float temperature) {
@@ -135,7 +135,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::TrSet);
}
bool setRoomSetpointCh2(float temperature) {
@@ -145,7 +145,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::TrSetCH2);
}
bool setRoomTemp(float temperature) {
@@ -155,7 +155,7 @@ public:
temperatureToData(temperature)
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::Tr);
}
bool sendBoilerReset() {
@@ -167,7 +167,7 @@ public:
data
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
}
bool sendServiceReset() {
@@ -179,7 +179,7 @@ public:
data
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
}
bool sendWaterFilling() {
@@ -191,7 +191,13 @@ public:
data
));
return isValidResponse(response);
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
}
static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
byte responseId = (response >> 16) & 0xFF;
return (byte)id == responseId;
}
// converters

63
src/OpenThermTask.h
View File

@@ -166,7 +166,7 @@ protected:
statusLb
);
if (!CustomOpenTherm::isValidResponse(response)) {
if (!CustomOpenTherm::isValidResponse(response) || !CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Status)) {
Log.swarningln(
FPSTR(L_OT),
F("Failed receive boiler status: %s"),
@@ -717,6 +717,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::SConfigSMemberIDcode)) {
return false;
}
vars.parameters.slaveMemberId = response & 0xFF;
@@ -776,7 +779,7 @@ protected:
request
));
return CustomOpenTherm::isValidResponse(response);
return CustomOpenTherm::isValidResponse(response) && CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MConfigMMemberIDcode);
}
bool setMaxModulationLevel(byte value) {
@@ -788,6 +791,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MaxRelModLevelSetting)) {
return false;
}
vars.parameters.maxModulation = CustomOpenTherm::getFloat(response);
@@ -803,6 +809,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::OpenThermVersionSlave)) {
return false;
}
vars.parameters.slaveOtVersion = CustomOpenTherm::getFloat(response);
@@ -818,6 +827,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::OpenThermVersionMaster)) {
return false;
}
vars.parameters.masterOtVersion = CustomOpenTherm::getFloat(response);
@@ -834,6 +846,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::SlaveVersion)) {
return false;
}
vars.parameters.slaveVersion = response & 0xFF;
@@ -851,6 +866,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MasterVersion)) {
return false;
}
vars.parameters.masterVersion = response & 0xFF;
@@ -868,6 +886,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::TdhwSetUBTdhwSetLB)) {
return false;
}
byte minTemp = response & 0xFF;
@@ -892,6 +913,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MaxTSetUBMaxTSetLB)) {
return false;
}
byte minTemp = response & 0xFF;
@@ -913,7 +937,7 @@ protected:
CustomOpenTherm::temperatureToData(value)
));
return CustomOpenTherm::isValidResponse(response);
return CustomOpenTherm::isValidResponse(response) && CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MaxTSet);
}
bool updateOutdoorTemp() {
@@ -925,6 +949,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Toutside)) {
return false;
}
float value = settings.sensors.outdoor.offset + convertTemp(
@@ -952,6 +979,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Texhaust)) {
return false;
}
float value = (float) CustomOpenTherm::getInt(response);
@@ -984,6 +1014,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Tboiler)) {
return false;
}
float value = CustomOpenTherm::getFloat(response);
@@ -1016,6 +1049,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Tret)) {
return false;
}
float value = convertTemp(
@@ -1045,6 +1081,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Tdhw)) {
return false;
}
float value = CustomOpenTherm::getFloat(response);
@@ -1077,6 +1116,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWFlowRate)) {
return false;
}
float value = CustomOpenTherm::getFloat(response);
@@ -1116,6 +1158,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::ASFflags)) {
return false;
}
vars.sensors.faultCode = response & 0xFF;
@@ -1131,6 +1176,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::OEMDiagnosticCode)) {
return false;
}
vars.sensors.diagnosticCode = CustomOpenTherm::getUInt(response);
@@ -1146,6 +1194,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::RelModLevel)) {
return false;
}
float value = CustomOpenTherm::getFloat(response);
@@ -1172,6 +1223,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::MaxCapacityMinModLevel)) {
return false;
}
vars.parameters.minModulation = response & 0xFF;
@@ -1189,6 +1243,9 @@ protected:
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
} else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CHPressure)) {
return false;
}
float value = CustomOpenTherm::getFloat(response);