diff --git a/lib/CustomOpenTherm/CustomOpenTherm.h b/lib/CustomOpenTherm/CustomOpenTherm.h index ae6deb8..579f419 100644 --- a/lib/CustomOpenTherm/CustomOpenTherm.h +++ b/lib/CustomOpenTherm/CustomOpenTherm.h @@ -76,18 +76,24 @@ public: return buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Status, data); } - bool setBoilerTemperature(float temperature) { + bool setHeatingCh1Temp(float temperature) { unsigned int data = temperatureToData(temperature); unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TSet, data)); return isValidResponse(response); } - bool setBoilerTemperature2(float temperature) { + bool setHeatingCh2Temp(float temperature) { unsigned int data = temperatureToData(temperature); unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TsetCH2, data)); 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() { unsigned int data = 1; data <<= 8; diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h index 7e94821..72c28e1 100644 --- a/src/OpenThermTask.h +++ b/src/OpenThermTask.h @@ -215,7 +215,7 @@ protected: Log.sinfoln("OT.DHW", "Set temp = %u", newDHWTemp); // Записываем заданную температуру ГВС - if (ot->setDHWSetpoint(newDHWTemp)) { + if (ot->setDHWTemp(newDHWTemp)) { currentDHWTemp = newDHWTemp; dhwSetTempTime = millis(); @@ -230,7 +230,7 @@ protected: 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; heatingSetTempTime = millis(); @@ -239,7 +239,7 @@ protected: } if (settings.opentherm.heatingCh1ToCh2) { - if (!ot->setBoilerTemperature2(vars.parameters.heatingSetpoint)) { + if (!ot->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) { Log.swarningln("OT.HEATING", "Failed set ch2 temp"); } }