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

Merge branch 'dev11' into dev

Browse Source
This commit is contained in:
MichaelDvP
2023-05-10 18:47:07 +02:00
parent b2ad600de2 ea71b43f78
commit e6f839b554
162 changed files with 9895 additions and 7470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/boiler.cpp
View File

@@ -833,7 +833,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
// Check if hot tap water or heating is active
// Values will always be posted first time as heatingActive_ and tapwaterActive_ will have values EMS_VALUE_BOOL_NOTSET
void Boiler::check_active(const bool force) {
void Boiler::check_active() {
if (!Helpers::hasValue(boilerState_)) {
return;
}
@@ -844,7 +844,7 @@ void Boiler::check_active(const bool force) {
// check if heating is active, bits 2 and 4 must be set
b = ((boilerState_ & 0x09) == 0x09);
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (heatingActive_ != val || force) {
if (heatingActive_ != val) {
heatingActive_ = val;
char s[12];
Mqtt::queue_publish(F_(heating_active), Helpers::render_boolean(s, b));
@@ -868,7 +868,7 @@ void Boiler::check_active(const bool force) {
}
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (tapwaterActive_ != val || force) {
if (tapwaterActive_ != val) {
tapwaterActive_ = val;
char s[12];
Mqtt::queue_publish(F_(tapwater_active), Helpers::render_boolean(s, b));