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

fix: correction pressure and DHW flow rate, if the received value is x10

Browse Source
This commit is contained in:
Yurii
2023-12-24 18:50:54 +03:00
parent 347723cbba
commit 67ae236f25
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/OpenThermTask.h
View File

@@ -30,6 +30,8 @@ protected:
unsigned long startupTime = millis(); unsigned long startupTime = millis();
unsigned long dhwSetTempTime = 0; unsigned long dhwSetTempTime = 0;
unsigned long heatingSetTempTime = 0; unsigned long heatingSetTempTime = 0;
byte dhwFlowRateMultiplier = 1;
byte pressureMultiplier = 1;
const char* getTaskName() { const char* getTaskName() {
return "OpenTherm"; return "OpenTherm";
@@ -59,6 +61,9 @@ protected:
} }
void initBoiler() { void initBoiler() {
this->dhwFlowRateMultiplier = 1;
this->pressureMultiplier = 1;
// Not all boilers support these, only try once when the boiler becomes connected // Not all boilers support these, only try once when the boiler becomes connected
if (updateSlaveVersion()) { if (updateSlaveVersion()) {
Log.straceln(FPSTR(S_OT), F("Slave version: %u, type: %u"), vars.parameters.slaveVersion, vars.parameters.slaveType); Log.straceln(FPSTR(S_OT), F("Slave version: %u, type: %u"), vars.parameters.slaveVersion, vars.parameters.slaveType);
@@ -88,7 +93,6 @@ protected:
} else { } else {
Log.swarningln(FPSTR(S_OT), F("Set master config failed")); Log.swarningln(FPSTR(S_OT), F("Set master config failed"));
} }
} }
void loop() { void loop() {
@@ -625,8 +629,13 @@ protected:
if (!ot->isValidResponse(response)) { if (!ot->isValidResponse(response)) {
return false; return false;
} }
vars.sensors.dhwFlowRate = ot->getFloat(response); float value = ot->getFloat(response);
if (value > 16 && this->dhwFlowRateMultiplier != 10) {
this->dhwFlowRateMultiplier = 10;
}
vars.sensors.dhwFlowRate = this->dhwFlowRateMultiplier == 1 ? value : value / this->dhwFlowRateMultiplier;
return true; return true;
} }
@@ -665,7 +674,12 @@ protected:
return false; return false;
} }
vars.sensors.pressure = ot->getFloat(response); float value = ot->getFloat(response);
if (value > 5 && this->pressureMultiplier != 10) {
this->pressureMultiplier = 10;
}
vars.sensors.pressure = this->pressureMultiplier == 1 ? value : value / this->pressureMultiplier;
return true; return true;
} }
}; };