From c9f5b0a2c1307def841e15aaba1e9eba4ac3d562 Mon Sep 17 00:00:00 2001
From: MichaelDvP <github@mdvp.de>
Date: Sat, 9 Dec 2023 15:39:10 +0100
Subject: [PATCH] fix wwCurFlow #1334, fix active state #1483, dev.4

---
 interface/package.json |  2 +-
 interface/yarn.lock    | 10 +++++-----
 src/devices/boiler.cpp |  9 +++++++--
 src/version.h          |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/interface/package.json b/interface/package.json
index 5872099bf..4c75a7a19 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -30,7 +30,7 @@
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
     "@types/node": "^20.10.4",
-    "@types/react": "^18.2.42",
+    "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
     "@types/react-router-dom": "^5.3.3",
     "alova": "^2.16.0",
diff --git a/interface/yarn.lock b/interface/yarn.lock
index 645ef511c..62abd4bbe 100644
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -1606,14 +1606,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^18.2.42":
-  version: 18.2.42
-  resolution: "@types/react@npm:18.2.42"
+"@types/react@npm:^18.2.43":
+  version: 18.2.43
+  resolution: "@types/react@npm:18.2.43"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: b6ee1873ba551ca7bf87cefff00a615aa4322cd68d425858a2e09be260d8037d7fc68865739d2b05cc88cefa7acd009afdaea43e9856fc6302b322cc8c19464e
+  checksum: a9d90a93380bb67623f27eba83e2d05b548109f7eb6fd591f5c4a3716bc257cc7cb078455db7ea4308d5f2ff6b4fe48d9a4a560145d9384069a2b5121bc93937
   languageName: node
   linkType: hard
 
@@ -1794,7 +1794,7 @@ __metadata:
     "@types/imagemin": "npm:^8.0.5"
     "@types/lodash-es": "npm:^4.17.12"
     "@types/node": "npm:^20.10.4"
-    "@types/react": "npm:^18.2.42"
+    "@types/react": "npm:^18.2.43"
     "@types/react-dom": "npm:^18.2.17"
     "@types/react-router-dom": "npm:^5.3.3"
     "@typescript-eslint/eslint-plugin": "npm:^6.13.2"
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index f77adbc96..b612dd03a 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -1184,7 +1184,10 @@ void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
 
     has_update(telegram, serviceCodeNumber_, 20);
 
-    if (telegram->offset <= 4 && telegram->offset + telegram->message_length > 5) {
+    if (telegram->offset <= 4 && telegram->offset + telegram->message_length > 7) {
+        if (burnGas_ || burnGas2_) {
+            boilerState_ |= 0x08; // set flame signal
+        }
         check_active(); // do a quick check to see if the hot water or heating is active
     }
 }
@@ -1475,7 +1478,9 @@ void Boiler::process_UBAMonitorWWPlus(std::shared_ptr<const Telegram> telegram)
     has_update(telegram, wwSetTemp_, 0);
     has_update(telegram, wwCurTemp_, 1);
     has_update(telegram, wwCurTemp2_, 3);
-    has_update(telegram, wwCurFlow_, 11);
+    if (!is_received(0x779)) { // HIUMonitor
+        has_update(telegram, wwCurFlow_, 11);
+    }
 
     has_update(telegram, wwWorkM_, 14, 3);  // force to 3 bytes
     has_update(telegram, wwStarts_, 17, 3); // force to 3 bytes
diff --git a/src/version.h b/src/version.h
index c5e1ec57c..98c9132ab 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.5-dev.3"
+#define EMSESP_APP_VERSION "3.6.5-dev.4"