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: optimization

Browse Source
This commit is contained in:
Yurii
2024-01-27 18:42:51 +03:00
parent cad9e50a78
commit d374ddc02a
2 changed files with 199 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
lib/CustomOpenTherm/CustomOpenTherm.h
View File

@@ -29,17 +29,15 @@ public:
unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) { unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
_attempt++; _attempt++;
bool antiFreeze = true;
while (antiFreeze || (this->prevRequestTime > 0 && millis() - this->prevRequestTime <= 200)) { while (!this->isReady()) {
if (this->yieldCallback) { if (this->yieldCallback) {
this->yieldCallback(); this->yieldCallback();
} else { } else {
::yield(); ::yield();
} }
if (antiFreeze) { this->process();
antiFreeze = false;
}
} }
if (this->beforeSendRequestCallback) { if (this->beforeSendRequestCallback) {
@@ -47,29 +45,27 @@ public:
} }
unsigned long _response; unsigned long _response;
if (!sendRequestAync(request)) { OpenThermResponseStatus _responseStatus = OpenThermResponseStatus::NONE;
if (!this->sendRequestAync(request)) {
_response = 0; _response = 0;
} else { } else {
while (true) { while (true) {
process(); this->process();
if (isReady()) { if (this->status == OpenThermStatus::READY || this->status == OpenThermStatus::DELAY) {
break; break;
} } else if (this->yieldCallback) {
if (this->yieldCallback) {
this->yieldCallback(); this->yieldCallback();
} else { } else {
::yield(); ::yield();
} }
} }
_response = getLastResponse(); _response = this->getLastResponse();
_responseStatus = this->getLastResponseStatus();
} }
this->prevRequestTime = millis();
OpenThermResponseStatus _responseStatus = getLastResponseStatus();
if (this->afterSendRequestCallback) { if (this->afterSendRequestCallback) {
this->afterSendRequestCallback(request, _response, _responseStatus, _attempt); this->afterSendRequestCallback(request, _response, _responseStatus, _attempt);
} }
@@ -78,56 +74,90 @@ public:
return _response; return _response;
} else { } else {
return sendRequest(request, attempts, _attempt); return this->sendRequest(request, attempts, _attempt);
} }
} }
unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking) { unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking) {
return sendRequest(buildSetBoilerStatusRequest(enableCentralHeating, enableHotWater, enableCooling, enableOutsideTemperatureCompensation, enableCentralHeating2, summerWinterMode, dhwBlocking)); unsigned int data = enableCentralHeating
} | (enableHotWater << 1)
| (enableCooling << 2)
unsigned long buildSetBoilerStatusRequest(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking) { | (enableOutsideTemperatureCompensation << 3)
unsigned int data = enableCentralHeating | (enableHotWater << 1) | (enableCooling << 2) | (enableOutsideTemperatureCompensation << 3) | (enableCentralHeating2 << 4) | (summerWinterMode << 5) | (dhwBlocking << 6); | (enableCentralHeating2 << 4)
| (summerWinterMode << 5)
| (dhwBlocking << 6);
data <<= 8; data <<= 8;
return buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Status, data);
return this->sendRequest(this->buildRequest(
OpenThermMessageType::READ_DATA,
OpenThermMessageID::Status,
data
));
} }
bool setHeatingCh1Temp(float temperature) { bool setHeatingCh1Temp(float temperature) {
unsigned int data = temperatureToData(temperature); unsigned long response = this->sendRequest(this->buildRequest(
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TSet, data)); OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::TSet,
this->temperatureToData(temperature)
));
return isValidResponse(response); return isValidResponse(response);
} }
bool setHeatingCh2Temp(float temperature) { bool setHeatingCh2Temp(float temperature) {
unsigned int data = temperatureToData(temperature); unsigned long response = this->sendRequest(this->buildRequest(
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TsetCH2, data)); OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::TsetCH2,
this->temperatureToData(temperature)
));
return isValidResponse(response); return isValidResponse(response);
} }
bool setDhwTemp(float temperature) { bool setDhwTemp(float temperature) {
unsigned int data = temperatureToData(temperature); unsigned long response = this->sendRequest(this->buildRequest(
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::TdhwSet, data)); OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::TdhwSet,
this->temperatureToData(temperature)
));
return isValidResponse(response); return isValidResponse(response);
} }
bool sendBoilerReset() { bool sendBoilerReset() {
unsigned int data = 1; unsigned int data = 1;
data <<= 8; data <<= 8;
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data)); unsigned long response = this->sendRequest(this->buildRequest(
OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::Command,
data
));
return isValidResponse(response); return isValidResponse(response);
} }
bool sendServiceReset() { bool sendServiceReset() {
unsigned int data = 10; unsigned int data = 10;
data <<= 8; data <<= 8;
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data)); unsigned long response = this->sendRequest(this->buildRequest(
OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::Command,
data
));
return isValidResponse(response); return isValidResponse(response);
} }
bool sendWaterFilling() { bool sendWaterFilling() {
unsigned int data = 2; unsigned int data = 2;
data <<= 8; data <<= 8;
unsigned long response = sendRequest(buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::Command, data)); unsigned long response = this->sendRequest(this->buildRequest(
OpenThermMessageType::WRITE_DATA,
OpenThermMessageID::Command,
data
));
return isValidResponse(response); return isValidResponse(response);
} }
@@ -136,12 +166,12 @@ public:
const byte valueLB = response & 0xFF; const byte valueLB = response & 0xFF;
const byte valueHB = (response >> 8) & 0xFF; const byte valueHB = (response >> 8) & 0xFF;
float value = (int8_t) valueHB; float value = (int8_t)valueHB;
return value + (float) valueLB / 256.0; return value + (float)valueLB / 256.0;
} }
template <class T> unsigned int toF88(T val) { template <class T> unsigned int toF88(T val) {
return (unsigned int) (val * 256); return (unsigned int)(val * 256);
} }
int16_t fromS16(unsigned long response) { int16_t fromS16(unsigned long response) {
@@ -156,5 +186,4 @@ protected:
YieldCallback yieldCallback; YieldCallback yieldCallback;
BeforeSendRequestCallback beforeSendRequestCallback; BeforeSendRequestCallback beforeSendRequestCallback;
AfterSendRequestCallback afterSendRequestCallback; AfterSendRequestCallback afterSendRequestCallback;
unsigned long prevRequestTime = 0;
}; };

214
src/OpenThermTask.h
View File

@@ -19,7 +19,7 @@ protected:
unsigned short heatingSetTempInterval = 60000; unsigned short heatingSetTempInterval = 60000;
bool pump = true; bool pump = true;
bool prevOtStatus = false; unsigned long lastSuccessResponse = 0;
unsigned long prevUpdateNonEssentialVars = 0; unsigned long prevUpdateNonEssentialVars = 0;
unsigned long startupTime = millis(); unsigned long startupTime = millis();
unsigned long dhwSetTempTime = 0; unsigned long dhwSetTempTime = 0;
@@ -42,12 +42,32 @@ protected:
void setup() { void setup() {
Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inPin, settings.opentherm.outPin); Log.sinfoln(FPSTR(L_OT), F("Started. GPIO IN: %hhu, GPIO OUT: %hhu"), settings.opentherm.inPin, settings.opentherm.outPin);
ot->setMinWaitTimeForStartBit(19000); // 20ms - 5% ot->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
ot->setAfterSendRequestCallback(OpenThermTask::sendRequestCallback); Log.straceln(
FPSTR(L_OT),
F("ID: %4d Request: %8lx Response: %8lx Attempt: %2d Status: %s"),
ot->getDataID(request), request, response, attempt, ot->statusToString(status)
);
if (status == OpenThermResponseStatus::SUCCESS) {
this->lastSuccessResponse = millis();
#ifdef LED_OT_RX_PIN
{
digitalWrite(LED_OT_RX_PIN, true);
delayMicroseconds(2000);
digitalWrite(LED_OT_RX_PIN, false);
}
#endif
}
});
ot->setYieldCallback([this]() { ot->setYieldCallback([this]() {
this->delay(25); this->delay(25);
}); });
ot->begin(OpenThermTask::handleInterrupt, OpenThermTask::responseCallback);
ot->setMinWaitTimeForStartBit(19500);
ot->begin(OpenThermTask::handleInterrupt);
#ifdef LED_OT_RX_PIN #ifdef LED_OT_RX_PIN
pinMode(LED_OT_RX_PIN, OUTPUT); pinMode(LED_OT_RX_PIN, OUTPUT);
@@ -117,19 +137,26 @@ protected:
Log.swarningln(FPSTR(L_OT), F("Invalid response after setBoilerStatus: %s"), ot->statusToString(ot->getLastResponseStatus())); Log.swarningln(FPSTR(L_OT), F("Invalid response after setBoilerStatus: %s"), ot->statusToString(ot->getLastResponseStatus()));
} }
if (vars.states.otStatus && !this->prevOtStatus) { if (!vars.states.otStatus && millis() - this->lastSuccessResponse < 1150) {
this->prevOtStatus = vars.states.otStatus;
Log.sinfoln(FPSTR(L_OT), F("Connected. Initializing")); Log.sinfoln(FPSTR(L_OT), F("Connected. Initializing"));
vars.states.otStatus = true;
this->initBoiler(); this->initBoiler();
} else if (!vars.states.otStatus && this->prevOtStatus) { } else if (vars.states.otStatus && millis() - this->lastSuccessResponse > 1150) {
this->prevOtStatus = vars.states.otStatus;
Log.swarningln(FPSTR(L_OT), F("Disconnected")); Log.swarningln(FPSTR(L_OT), F("Disconnected"));
vars.states.otStatus = false;
} }
// If boiler is disconnected, no need try setting other OT stuff
if (!vars.states.otStatus) { if (!vars.states.otStatus) {
// Boiler is disconnected, no need try setting other OT stuff vars.states.heating = false;
vars.states.dhw = false;
vars.states.flame = false;
vars.states.fault = false;
vars.states.diagnostic = false;
return; return;
} }
@@ -164,7 +191,8 @@ protected:
} }
} }
// DHW min/max temp
// Get DHW min/max temp (if necessary)
if (settings.opentherm.dhwPresent) { if (settings.opentherm.dhwPresent) {
if (updateMinMaxDhwTemp()) { if (updateMinMaxDhwTemp()) {
if (settings.dhw.minTemp < vars.parameters.dhwMinTemp) { if (settings.dhw.minTemp < vars.parameters.dhwMinTemp) {
@@ -191,7 +219,7 @@ protected:
} }
// Heating min/max temp // Get heating min/max temp
if (updateMinMaxHeatingTemp()) { if (updateMinMaxHeatingTemp()) {
if (settings.heating.minTemp < vars.parameters.heatingMinTemp) { if (settings.heating.minTemp < vars.parameters.heatingMinTemp) {
settings.heating.minTemp = vars.parameters.heatingMinTemp; settings.heating.minTemp = vars.parameters.heatingMinTemp;
@@ -215,13 +243,15 @@ protected:
fsSettings.update(); fsSettings.update();
} }
// force set max CH temp // Force set max heating temp
setMaxHeatingTemp(settings.heating.maxTemp); setMaxHeatingTemp(settings.heating.maxTemp);
// Get outdoor temp (if necessary)
if (settings.sensors.outdoor.type == 0) { if (settings.sensors.outdoor.type == 0) {
updateOutsideTemp(); updateOutsideTemp();
} }
// Get fault code (if necessary)
if (vars.states.fault) { if (vars.states.fault) {
updateFaultCode(); updateFaultCode();
} }
@@ -231,6 +261,8 @@ protected:
this->prevUpdateNonEssentialVars = millis(); this->prevUpdateNonEssentialVars = millis();
} }
// Get current modulation level (if necessary)
if ((settings.opentherm.dhwPresent && settings.dhw.enable) || settings.heating.enable || heatingEnabled) { if ((settings.opentherm.dhwPresent && settings.dhw.enable) || settings.heating.enable || heatingEnabled) {
updateModulationLevel(); updateModulationLevel();
@@ -238,6 +270,7 @@ protected:
vars.sensors.modulation = 0; vars.sensors.modulation = 0;
} }
// Update DHW sensors (if necessary)
if (settings.opentherm.dhwPresent) { if (settings.opentherm.dhwPresent) {
updateDhwTemp(); updateDhwTemp();
updateDhwFlowRate(); updateDhwFlowRate();
@@ -247,9 +280,11 @@ protected:
vars.sensors.dhwFlowRate = 0.0f; vars.sensors.dhwFlowRate = 0.0f;
} }
// Get current heating temp
updateHeatingTemp(); updateHeatingTemp();
// fault reset action
// Fault reset action
if (vars.actions.resetFault) { if (vars.actions.resetFault) {
if (vars.states.fault) { if (vars.states.fault) {
if (ot->sendBoilerReset()) { if (ot->sendBoilerReset()) {
@@ -263,7 +298,7 @@ protected:
vars.actions.resetFault = false; vars.actions.resetFault = false;
} }
// diag reset action // Diag reset action
if (vars.actions.resetDiagnostic) { if (vars.actions.resetDiagnostic) {
if (vars.states.diagnostic) { if (vars.states.diagnostic) {
if (ot->sendServiceReset()) { if (ot->sendServiceReset()) {
@@ -277,8 +312,8 @@ protected:
vars.actions.resetDiagnostic = false; vars.actions.resetDiagnostic = false;
} }
//
// Температура ГВС // Update DHW temp
byte newDhwTemp = settings.dhw.target; byte newDhwTemp = settings.dhw.target;
if (settings.opentherm.dhwPresent && settings.dhw.enable && (needSetDhwTemp() || newDhwTemp != currentDhwTemp)) { if (settings.opentherm.dhwPresent && settings.dhw.enable && (needSetDhwTemp() || newDhwTemp != currentDhwTemp)) {
if (newDhwTemp < settings.dhw.minTemp || newDhwTemp > settings.dhw.maxTemp) { if (newDhwTemp < settings.dhw.minTemp || newDhwTemp > settings.dhw.maxTemp) {
@@ -287,7 +322,7 @@ protected:
Log.sinfoln(FPSTR(L_OT_DHW), F("Set temp = %u"), newDhwTemp); Log.sinfoln(FPSTR(L_OT_DHW), F("Set temp = %u"), newDhwTemp);
// Записываем заданную температуру ГВС // Set DHW temp
if (ot->setDhwTemp(newDhwTemp)) { if (ot->setDhwTemp(newDhwTemp)) {
currentDhwTemp = newDhwTemp; currentDhwTemp = newDhwTemp;
this->dhwSetTempTime = millis(); this->dhwSetTempTime = millis();
@@ -296,6 +331,7 @@ protected:
Log.swarningln(FPSTR(L_OT_DHW), F("Failed set temp")); Log.swarningln(FPSTR(L_OT_DHW), F("Failed set temp"));
} }
// Set DHW temp to CH2
if (settings.opentherm.dhwToCh2) { if (settings.opentherm.dhwToCh2) {
if (!ot->setHeatingCh2Temp(newDhwTemp)) { if (!ot->setHeatingCh2Temp(newDhwTemp)) {
Log.swarningln(FPSTR(L_OT_DHW), F("Failed set ch2 temp")); Log.swarningln(FPSTR(L_OT_DHW), F("Failed set ch2 temp"));
@@ -303,12 +339,12 @@ protected:
} }
} }
//
// Температура отопления // Update heating temp
if (heatingEnabled && (needSetHeatingTemp() || fabs(vars.parameters.heatingSetpoint - currentHeatingTemp) > 0.0001)) { if (heatingEnabled && (needSetHeatingTemp() || fabs(vars.parameters.heatingSetpoint - currentHeatingTemp) > 0.0001)) {
Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp = %u"), vars.parameters.heatingSetpoint); Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp = %u"), vars.parameters.heatingSetpoint);
// Записываем заданную температуру // Set heating temp
if (ot->setHeatingCh1Temp(vars.parameters.heatingSetpoint)) { if (ot->setHeatingCh1Temp(vars.parameters.heatingSetpoint)) {
currentHeatingTemp = vars.parameters.heatingSetpoint; currentHeatingTemp = vars.parameters.heatingSetpoint;
this->heatingSetTempTime = millis(); this->heatingSetTempTime = millis();
@@ -317,6 +353,7 @@ protected:
Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set temp")); Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set temp"));
} }
// Set heating temp to CH2
if (settings.opentherm.heatingCh1ToCh2) { if (settings.opentherm.heatingCh1ToCh2) {
if (!ot->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) { if (!ot->setHeatingCh2Temp(vars.parameters.heatingSetpoint)) {
Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set ch2 temp")); Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set ch2 temp"));
@@ -324,6 +361,7 @@ protected:
} }
} }
// Hysteresis // Hysteresis
// Only if enabled PID or/and Equitherm // Only if enabled PID or/and Equitherm
if (settings.heating.hysteresis > 0 && (!vars.states.emergency || settings.emergency.usePid) && (settings.equitherm.enable || settings.pid.enable)) { if (settings.heating.hysteresis > 0 && (!vars.states.emergency || settings.emergency.usePid) && (settings.equitherm.enable || settings.pid.enable)) {
@@ -340,42 +378,6 @@ protected:
} }
} }
static void sendRequestCallback(unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
printRequestDetail(ot->getDataID(request), status, request, response, attempt);
}
static void responseCallback(unsigned long result, OpenThermResponseStatus status) {
static byte attempt = 0;
switch (status) {
case OpenThermResponseStatus::TIMEOUT:
if (vars.states.otStatus && ++attempt > OPENTHERM_OFFLINE_TRESHOLD) {
vars.states.otStatus = false;
attempt = OPENTHERM_OFFLINE_TRESHOLD;
}
break;
case OpenThermResponseStatus::SUCCESS:
attempt = 0;
if (!vars.states.otStatus) {
vars.states.otStatus = true;
}
#ifdef LED_OT_RX_PIN
{
digitalWrite(LED_OT_RX_PIN, true);
unsigned long ts = millis();
while (millis() - ts < 2) {}
digitalWrite(LED_OT_RX_PIN, false);
}
#endif
break;
default:
break;
}
}
bool isReady() { bool isReady() {
return millis() - this->startupTime > this->readyTime; return millis() - this->startupTime > this->readyTime;
} }
@@ -388,12 +390,13 @@ protected:
return millis() - this->heatingSetTempTime > this->heatingSetTempInterval; return millis() - this->heatingSetTempTime > this->heatingSetTempInterval;
} }
static void printRequestDetail(OpenThermMessageID id, OpenThermResponseStatus status, unsigned long request, unsigned long response, byte attempt) {
Log.straceln(FPSTR(L_OT), F("OT REQUEST ID: %4d Request: %8lx Response: %8lx Attempt: %2d Status: %s"), id, request, response, attempt, ot->statusToString(status));
}
bool updateSlaveConfig() { bool updateSlaveConfig() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::SConfigSMemberIDcode, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::SConfigSMemberIDcode,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -474,7 +477,12 @@ protected:
} }
bool updateSlaveOtVersion() { bool updateSlaveOtVersion() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::OpenThermVersionSlave, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::OpenThermVersionSlave,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -500,7 +508,12 @@ protected:
} }
bool updateSlaveVersion() { bool updateSlaveVersion() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::SlaveVersion, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::SlaveVersion,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -515,7 +528,7 @@ protected:
unsigned long response = ot->sendRequest(ot->buildRequest( unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::WRITE_DATA, OpenThermRequestType::WRITE_DATA,
OpenThermMessageID::MasterVersion, OpenThermMessageID::MasterVersion,
(unsigned int) version | (unsigned int) type << 8 // 0x013F (unsigned int) version | (unsigned int) type << 8
)); ));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
@@ -529,7 +542,12 @@ protected:
} }
bool updateMinMaxDhwTemp() { bool updateMinMaxDhwTemp() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::TdhwSetUBTdhwSetLB, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::TdhwSetUBTdhwSetLB,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -548,7 +566,12 @@ protected:
} }
bool updateMinMaxHeatingTemp() { bool updateMinMaxHeatingTemp() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::MaxTSetUBMaxTSetLB, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::MaxTSetUBMaxTSetLB,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -566,16 +589,22 @@ protected:
} }
bool setMaxHeatingTemp(byte value) { bool setMaxHeatingTemp(byte value) {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermMessageType::WRITE_DATA, OpenThermMessageID::MaxTSet, ot->temperatureToData(value))); unsigned long response = ot->sendRequest(ot->buildRequest(
if (!ot->isValidResponse(response)) { OpenThermMessageType::WRITE_DATA,
return false; OpenThermMessageID::MaxTSet,
} ot->temperatureToData(value)
));
return true; return ot->isValidResponse(response);
} }
bool updateOutsideTemp() { bool updateOutsideTemp() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::Toutside, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::Toutside,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -585,7 +614,12 @@ protected:
} }
bool updateHeatingTemp() { bool updateHeatingTemp() {
unsigned long response = ot->sendRequest(ot->buildGetBoilerTemperatureRequest()); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermMessageType::READ_DATA,
OpenThermMessageID::Tboiler,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -601,7 +635,12 @@ protected:
bool updateDhwTemp() { bool updateDhwTemp() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::Tdhw, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermMessageType::READ_DATA,
OpenThermMessageID::Tdhw,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -616,7 +655,12 @@ protected:
} }
bool updateDhwFlowRate() { bool updateDhwFlowRate() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermMessageType::READ_DATA, OpenThermMessageID::DHWFlowRate, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermMessageType::READ_DATA,
OpenThermMessageID::DHWFlowRate,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
@@ -631,7 +675,11 @@ protected:
} }
bool updateFaultCode() { bool updateFaultCode() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::ASFflags, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::ASFflags,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
@@ -642,7 +690,11 @@ protected:
} }
bool updateModulationLevel() { bool updateModulationLevel() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::RelModLevel, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::RelModLevel,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
@@ -659,7 +711,11 @@ protected:
} }
bool updatePressure() { bool updatePressure() {
unsigned long response = ot->sendRequest(ot->buildRequest(OpenThermRequestType::READ_DATA, OpenThermMessageID::CHPressure, 0)); unsigned long response = ot->sendRequest(ot->buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::CHPressure,
0
));
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;