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

rename methods

Browse Source
This commit is contained in:
Yurii
2023-11-23 00:28:23 +03:00
parent b5a0550c72
commit d2271513f2
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/CustomOpenTherm/CustomOpenTherm.h
View File

@@ -76,18 +76,24 @@ public:
return buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Status, data); return buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Status, data);
} }
bool setBoilerTemperature(float temperature) { bool setHeatingCh1Temp(float temperature) {
unsigned int data = temperatureToData(temperature); unsigned int data = temperatureToData(temperature);
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TSet, data)); unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TSet, data));
return isValidResponse(response); return isValidResponse(response);
} }
bool setBoilerTemperature2(float temperature) { bool setHeatingCh2Temp(float temperature) {
unsigned int data = temperatureToData(temperature); unsigned int data = temperatureToData(temperature);
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TsetCH2, data)); unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TsetCH2, data));
return isValidResponse(response); return isValidResponse(response);
} }
bool setDHWTemp(float temperature) {
unsigned int data = temperatureToData(temperature);
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TdhwSet, data));
return isValidResponse(response);
}
bool sendBoilerReset() { bool sendBoilerReset() {
unsigned int data = 1; unsigned int data = 1;
data <<= 8; data <<= 8;

6
src/OpenThermTask.h
View File

@@ -215,7 +215,7 @@ protected:
Log.sinfoln("OT.DHW", "Set temp = %u", newDHWTemp); Log.sinfoln("OT.DHW", "Set temp = %u", newDHWTemp);
// Записываем заданную температуру ГВС // Записываем заданную температуру ГВС
if (ot->setDHWSetpoint(newDHWTemp)) { if (ot->setDHWTemp(newDHWTemp)) {
currentDHWTemp = newDHWTemp; currentDHWTemp = newDHWTemp;
dhwSetTempTime = millis(); dhwSetTempTime = millis();
@@ -230,7 +230,7 @@ protected:
Log.sinfoln("OT.HEATING", "Set temp = %u", vars.parameters.heatingSetpoint); Log.sinfoln("OT.HEATING", "Set temp = %u", vars.parameters.heatingSetpoint);
// Записываем заданную температуру // Записываем заданную температуру
if (ot->setBoilerTemperature(vars.parameters.heatingSetpoint)) { if (ot->setHeatingCh1Temp(vars.parameters.heatingSetpoint)) {
currentHeatingTemp = vars.parameters.heatingSetpoint; currentHeatingTemp = vars.parameters.heatingSetpoint;
heatingSetTempTime = millis(); heatingSetTempTime = millis();
@@ -239,7 +239,7 @@ protected:
} }
if (settings.opentherm.heatingCh1ToCh2) { if (settings.opentherm.heatingCh1ToCh2) {
if (!ot->setBoilerTemperature2(vars.parameters.heatingSetpoint)) { if (!ot->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) {
Log.swarningln("OT.HEATING", "Failed set ch2 temp"); Log.swarningln("OT.HEATING", "Failed set ch2 temp");
} }
} }