mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-27 10:33:37 +05:00
Compare commits
3 Commits
467cfea449
...
1.4.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f4af237472 | ||
|
|
c3d0d94806 | ||
|
|
e4211c872c |
@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
|
||||
core_dir = .pio
|
||||
|
||||
[env]
|
||||
version = 1.4.5
|
||||
version = 1.4.6
|
||||
framework = arduino
|
||||
lib_deps =
|
||||
bblanchon/ArduinoJson@^7.1.0
|
||||
|
||||
@@ -605,7 +605,7 @@ protected:
|
||||
float indoorTemp = 0.0f;
|
||||
float convertedTemp = 0.0f;
|
||||
|
||||
if (!vars.sensors.indoor.connected) {
|
||||
if (vars.sensors.indoor.connected) {
|
||||
indoorTemp = vars.temperatures.indoor;
|
||||
convertedTemp = convertTemp(indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
|
||||
}
|
||||
@@ -667,26 +667,25 @@ protected:
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Hysteresis
|
||||
// Only if enabled PID or/and Equitherm or Native heating control via OT
|
||||
bool useHyst = false;
|
||||
if (settings.heating.hysteresis > 0.01f && vars.sensors.indoor.connected) {
|
||||
useHyst = settings.equitherm.enable || settings.pid.enable || settings.opentherm.nativeHeatingControl;
|
||||
}
|
||||
|
||||
// Hysteresis
|
||||
// Only if enabled PID or/and Equitherm or Native heating control via OT
|
||||
bool useHyst = false;
|
||||
if (settings.heating.hysteresis > 0.01f && vars.sensors.indoor.connected) {
|
||||
useHyst = settings.equitherm.enable || settings.pid.enable || settings.opentherm.nativeHeatingControl;
|
||||
}
|
||||
if (useHyst) {
|
||||
if (!this->heatingBlocking && vars.temperatures.indoor - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
|
||||
this->heatingBlocking = true;
|
||||
|
||||
if (useHyst) {
|
||||
if (!this->heatingBlocking && vars.temperatures.indoor - settings.heating.target + 0.0001f >= settings.heating.hysteresis) {
|
||||
this->heatingBlocking = true;
|
||||
|
||||
} else if (this->heatingBlocking && vars.temperatures.indoor - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
|
||||
this->heatingBlocking = false;
|
||||
}
|
||||
|
||||
} else if (this->heatingBlocking) {
|
||||
} else if (this->heatingBlocking && vars.temperatures.indoor - settings.heating.target - 0.0001f <= -(settings.heating.hysteresis)) {
|
||||
this->heatingBlocking = false;
|
||||
}
|
||||
|
||||
} else if (this->heatingBlocking) {
|
||||
this->heatingBlocking = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user