refactor: cosmetic changes; added coeff. setting for filtering numeric values

This commit is contained in:
Yurii
2024-10-13 21:42:33 +03:00
parent 8aab541afa
commit 45af7a30d8
8 changed files with 157 additions and 90 deletions

View File

@@ -139,7 +139,8 @@ protected:
// if use pid
if (settings.pid.enable) {
if (vars.parameters.heatingEnabled) {
//if (vars.parameters.heatingEnabled) {
if (settings.heating.enable) {
float pidResult = getPidTemp(
settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp,
settings.pid.maxTemp
@@ -160,8 +161,8 @@ protected:
}
} else if (fabs(pidRegulator.integral) > 0.0001f) {
pidRegulator.integral = 0;
Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
pidRegulator.integral = 0;
Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
}
// default temp, manual mode
@@ -259,7 +260,7 @@ protected:
pidRegulator.setLimits(minTemp, maxTemp);
pidRegulator.setDt(settings.pid.dt * 1000u);
pidRegulator.input = vars.temperatures.indoor;
pidRegulator.setpoint = settings.heating.target;
pidRegulator.setpoint = vars.states.emergency ? settings.emergency.target : settings.heating.target;
return pidRegulator.getResultTimer();
}