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

fix: log messages in RegulatorTask

Browse Source
This commit is contained in:
Yurii
2023-12-21 18:54:08 +03:00
parent ff5da950c1
commit cf4a60dd2d
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/RegulatorTask.h
View File

@@ -91,7 +91,7 @@ protected:
prevEtResult = etResult; prevEtResult = etResult;
newTemp += etResult; newTemp += etResult;
Log.sinfoln("REGULATOR.EQUITHERM", F("New emergency result: %hhu (%f)"), (uint8_t) round(etResult), etResult); Log.sinfoln("REGULATOR.EQUITHERM", F("New emergency result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
} else { } else {
newTemp += prevEtResult; newTemp += prevEtResult;
@@ -108,7 +108,7 @@ protected:
prevPidResult = pidResult; prevPidResult = pidResult;
newTemp += pidResult; newTemp += pidResult;
Log.sinfoln("REGULATOR.PID", F("New emergency result: %hhu (%f)"), (uint8_t) round(pidResult), pidResult); Log.sinfoln("REGULATOR.PID", F("New emergency result: %hhu (%.2f)"), (uint8_t) round(pidResult), pidResult);
} else { } else {
newTemp += prevPidResult; newTemp += prevPidResult;
@@ -131,7 +131,7 @@ protected:
if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001) { if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001) {
prevHeatingTarget = settings.heating.target; prevHeatingTarget = settings.heating.target;
Log.sinfoln("REGULATOR", F("New target: %f"), settings.heating.target); Log.sinfoln("REGULATOR", F("New target: %.2f"), settings.heating.target);
if (settings.equitherm.enable && settings.pid.enable) { if (settings.equitherm.enable && settings.pid.enable) {
pidRegulator.integral = 0; pidRegulator.integral = 0;
@@ -147,7 +147,7 @@ protected:
prevEtResult = etResult; prevEtResult = etResult;
newTemp += etResult; newTemp += etResult;
Log.sinfoln("REGULATOR.EQUITHERM", F("New result: %hhu (%f)"), (uint8_t) round(etResult), etResult); Log.sinfoln("REGULATOR.EQUITHERM", F("New result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
} else { } else {
newTemp += prevEtResult; newTemp += prevEtResult;
@@ -155,24 +155,25 @@ protected:
} }
// if use pid // if use pid
if (settings.pid.enable && vars.parameters.heatingEnabled) { if (settings.pid.enable) {
float pidResult = getPidTemp( if (vars.parameters.heatingEnabled) {
settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp, float pidResult = getPidTemp(
settings.equitherm.enable ? settings.pid.maxTemp : settings.pid.maxTemp settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp,
); settings.equitherm.enable ? settings.pid.maxTemp : settings.pid.maxTemp
);
if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) { if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
prevPidResult = pidResult; prevPidResult = pidResult;
newTemp += pidResult; newTemp += pidResult;
Log.sinfoln("REGULATOR.PID", F("New result: %hh (%f)"), (int8_t) round(pidResult), pidResult); Log.sinfoln("REGULATOR.PID", F("New result: %hhd (%.2f)"), (int8_t) round(pidResult), pidResult);
} else {
newTemp += prevPidResult;
}
} else { } else {
newTemp += prevPidResult; newTemp += prevPidResult;
} }
} else if (settings.pid.enable && !vars.parameters.heatingEnabled && prevPidResult != 0) {
newTemp += prevPidResult;
} }
// default temp, manual mode // default temp, manual mode