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

fix: fixed pressure and flow validation when using correction

Browse Source
This commit is contained in:
Yurii
2024-10-27 04:31:35 +03:00
parent 42fa95969f
commit f62e687d3f
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/OpenThermTask.h
View File

@@ -1080,17 +1080,29 @@ protected:
} }
float value = CustomOpenTherm::getFloat(response); float value = CustomOpenTherm::getFloat(response);
if (value < 0 || value > convertVolume(16, UnitSystem::METRIC, settings.opentherm.unitSystem)) { if (value < 0) {
return false; return false;
} }
value = convertVolume( // correction
value * settings.opentherm.dhwFlowRateFactor, value = value * settings.opentherm.dhwFlowRateFactor;
// no minuscule values
// some boilers send a response of 0.06 when there is no flow
if (value < 0.1f) {
value = 0.0f;
}
// protocol declares a maximum of 16 l/m
//if (value > convertVolume(16.0f, UnitSystem::METRIC, settings.opentherm.unitSystem)) {
// value = 0.0f;
//}
vars.sensors.dhwFlowRate = convertVolume(
value,
settings.opentherm.unitSystem, settings.opentherm.unitSystem,
settings.system.unitSystem settings.system.unitSystem
); );
vars.sensors.dhwFlowRate = value > 0.09f ? value : 0.0f;
return true; return true;
} }
@@ -1180,12 +1192,20 @@ protected:
} }
float value = CustomOpenTherm::getFloat(response); float value = CustomOpenTherm::getFloat(response);
if (value < 0 || value > convertPressure(5, UnitSystem::METRIC, settings.opentherm.unitSystem)) { if (value < 0) {
return false; return false;
} }
// correction
value = value * settings.opentherm.pressureFactor;
// protocol declares a maximum of 5 bar
//if (value > convertPressure(5.0f, UnitSystem::METRIC, settings.opentherm.unitSystem)) {
// value = 0.0f;
//}
value = convertPressure( value = convertPressure(
value * settings.opentherm.pressureFactor, value,
settings.opentherm.unitSystem, settings.opentherm.unitSystem,
settings.system.unitSystem settings.system.unitSystem
); );