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

fix pid

Browse Source
This commit is contained in:
Yurii
2023-10-11 19:04:58 +03:00
parent fca6dc9393
commit 6d3172b73b
5 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/MqttTask.h
View File

@@ -595,6 +595,7 @@ protected:
doc["temperatures"]["heating"] = vars.temperatures.heating; doc["temperatures"]["heating"] = vars.temperatures.heating;
doc["temperatures"]["dhw"] = vars.temperatures.dhw; doc["temperatures"]["dhw"] = vars.temperatures.dhw;
doc["parameters"]["heatingEnabled"] = vars.parameters.heatingEnabled;
doc["parameters"]["heatingMinTemp"] = vars.parameters.heatingMinTemp; doc["parameters"]["heatingMinTemp"] = vars.parameters.heatingMinTemp;
doc["parameters"]["heatingMaxTemp"] = vars.parameters.heatingMaxTemp; doc["parameters"]["heatingMaxTemp"] = vars.parameters.heatingMaxTemp;
doc["parameters"]["heatingSetpoint"] = vars.parameters.heatingSetpoint; doc["parameters"]["heatingSetpoint"] = vars.parameters.heatingSetpoint;

9
src/OpenThermTask.h
View File

@@ -36,9 +36,9 @@ protected:
WARN("Slave member id failed"); WARN("Slave member id failed");
} }
bool _heatingEnabled = (vars.states.emergency || settings.heating.enable) && pump && isReady(); bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && pump && isReady();
localResponse = ot->setBoilerStatus( localResponse = ot->setBoilerStatus(
_heatingEnabled, heatingEnabled,
settings.opentherm.dhwPresent && settings.dhw.enable, settings.opentherm.dhwPresent && settings.dhw.enable,
false, false, true, false, false false, false, true, false, false
); );
@@ -48,8 +48,8 @@ protected:
return; return;
} }
if ( heatingEnabled != _heatingEnabled ) { if ( vars.parameters.heatingEnabled != heatingEnabled ) {
heatingEnabled = _heatingEnabled; vars.parameters.heatingEnabled = heatingEnabled;
INFO_F("Heating enabled: %s\r\n", heatingEnabled ? "on\0" : "off\0"); INFO_F("Heating enabled: %s\r\n", heatingEnabled ? "on\0" : "off\0");
} }
@@ -201,7 +201,6 @@ protected:
protected: protected:
bool pump = true; bool pump = true;
bool heatingEnabled = false;
unsigned long prevUpdateNonEssentialVars = 0; unsigned long prevUpdateNonEssentialVars = 0;
unsigned long startupTime = millis(); unsigned long startupTime = millis();

4
src/RegulatorTask.h
View File

@@ -123,7 +123,7 @@ protected:
} }
// if use pid // if use pid
if (settings.pid.enable && vars.states.heating) { if (settings.pid.enable && vars.parameters.heatingEnabled) {
float pidResult = getPidTemp( float pidResult = getPidTemp(
settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp, settings.equitherm.enable ? (settings.pid.maxTemp * -1) : settings.pid.minTemp,
settings.equitherm.enable ? settings.pid.maxTemp : settings.pid.maxTemp settings.equitherm.enable ? settings.pid.maxTemp : settings.pid.maxTemp
@@ -139,7 +139,7 @@ protected:
newTemp += prevPidResult; newTemp += prevPidResult;
} }
} else if ( settings.pid.enable && !vars.states.heating && prevPidResult != 0 ) { } else if ( settings.pid.enable && !vars.parameters.heatingEnabled && prevPidResult != 0 ) {
newTemp += prevPidResult; newTemp += prevPidResult;
} }

1
src/Settings.h
View File

@@ -106,6 +106,7 @@ struct Variables {
} temperatures; } temperatures;
struct { struct {
bool heatingEnabled = false;
byte heatingMinTemp = 0; byte heatingMinTemp = 0;
byte heatingMaxTemp = 0; byte heatingMaxTemp = 0;
byte heatingSetpoint = 0.0f; byte heatingSetpoint = 0.0f;

2
src/defines.h
View File

@@ -1,4 +1,4 @@
#define OT_GATEWAY_VERSION "1.3.0" #define OT_GATEWAY_VERSION "1.3.1"
#define AP_SSID "OpenTherm Gateway" #define AP_SSID "OpenTherm Gateway"
#define AP_PASSWORD "otgateway123456" #define AP_PASSWORD "otgateway123456"
#define USE_TELNET #define USE_TELNET