andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge in flowsensor check from dev

Browse Source
This commit is contained in:
proddy
2021-01-07 21:17:59 +01:00
parent 40da73d012
commit 8f7d82df90
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/boiler.cpp
View File

@@ -561,7 +561,17 @@ void Boiler::check_active(const bool force) {
} }
// check if tap water is active, bits 1 and 4 must be set // check if tap water is active, bits 1 and 4 must be set
b = ((boilerState_ & 0x0A) == 0x0A); // also check if there is a flowsensor and flow-type
static bool flowsensor = false;
if (Helpers::hasValue(wWCurFlow_) && (wWCurFlow_ > 0) && (wWType_ == 1)) {
flowsensor = true;
}
if (flowsensor) {
b = ((wWCurFlow_ > 0) && ((boilerState_ & 0x0A) == 0x0A));
} else {
b = ((boilerState_ & 0x0A) == 0x0A);
}
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF; val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (tapwaterActive_ != val || force) { if (tapwaterActive_ != val || force) {
tapwaterActive_ = val; tapwaterActive_ = val;