jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-11 02:34:29 +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