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

refactor: some fixes

Browse Source
This commit is contained in:
Yurii
2024-11-12 10:48:29 +03:00
parent c6df74f06e
commit 636872f72d
9 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/RegulatorTask.h
View File

@@ -55,14 +55,15 @@ protected:
this->turbo();
this->hysteresis();
vars.master.heating.targetTemp = constrain(
this->getHeatingSetpoint(),
vars.master.heating.minTemp,
vars.master.heating.maxTemp
vars.master.heating.targetTemp = settings.heating.target;
vars.master.heating.setpointTemp = constrain(
this->getHeatingSetpointTemp(),
this->getHeatingMinSetpointTemp(),
this->getHeatingMaxSetpointTemp()
);
Sensors::setValueByType(
Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.targetTemp,
Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,
Sensors::ValueType::PRIMARY, true, true
);
}
@@ -104,8 +105,25 @@ protected:
}
}
inline float getHeatingMinSetpointTemp() {
if (settings.opentherm.nativeHeatingControl) {
return vars.master.heating.minTemp;
float getHeatingSetpoint() {
} else {
return settings.heating.minTemp;
}
}
inline float getHeatingMaxSetpointTemp() {
if (settings.opentherm.nativeHeatingControl) {
return vars.master.heating.maxTemp;
} else {
return settings.heating.maxTemp;
}
}
float getHeatingSetpointTemp() {
float newTemp = 0;
if (fabsf(prevHeatingTarget - settings.heating.target) > 0.0001f) {