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

fix wwCurFlow #1334, fix active state #1483, dev.4

Browse Source
This commit is contained in:
MichaelDvP
2023-12-09 15:39:10 +01:00
parent ed060a400d
commit c9f5b0a2c1
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
interface/package.json
View File

@@ -30,7 +30,7 @@
"@types/imagemin": "^8.0.5", "@types/imagemin": "^8.0.5",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.10.4", "@types/node": "^20.10.4",
"@types/react": "^18.2.42", "@types/react": "^18.2.43",
"@types/react-dom": "^18.2.17", "@types/react-dom": "^18.2.17",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"alova": "^2.16.0", "alova": "^2.16.0",

10
interface/yarn.lock
View File

@@ -1606,14 +1606,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react@npm:^18.2.42": "@types/react@npm:^18.2.43":
version: 18.2.42 version: 18.2.43
resolution: "@types/react@npm:18.2.42" resolution: "@types/react@npm:18.2.43"
dependencies: dependencies:
"@types/prop-types": "npm:*" "@types/prop-types": "npm:*"
"@types/scheduler": "npm:*" "@types/scheduler": "npm:*"
csstype: "npm:^3.0.2" csstype: "npm:^3.0.2"
checksum: b6ee1873ba551ca7bf87cefff00a615aa4322cd68d425858a2e09be260d8037d7fc68865739d2b05cc88cefa7acd009afdaea43e9856fc6302b322cc8c19464e checksum: a9d90a93380bb67623f27eba83e2d05b548109f7eb6fd591f5c4a3716bc257cc7cb078455db7ea4308d5f2ff6b4fe48d9a4a560145d9384069a2b5121bc93937
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1794,7 +1794,7 @@ __metadata:
"@types/imagemin": "npm:^8.0.5" "@types/imagemin": "npm:^8.0.5"
"@types/lodash-es": "npm:^4.17.12" "@types/lodash-es": "npm:^4.17.12"
"@types/node": "npm:^20.10.4" "@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-dom": "npm:^18.2.17"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
"@typescript-eslint/eslint-plugin": "npm:^6.13.2" "@typescript-eslint/eslint-plugin": "npm:^6.13.2"

7
src/devices/boiler.cpp
View File

@@ -1184,7 +1184,10 @@ void Boiler::process_UBAMonitorFast(std::shared_ptr<const Telegram> telegram) {
has_update(telegram, serviceCodeNumber_, 20); 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 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, wwSetTemp_, 0);
has_update(telegram, wwCurTemp_, 1); has_update(telegram, wwCurTemp_, 1);
has_update(telegram, wwCurTemp2_, 3); has_update(telegram, wwCurTemp2_, 3);
if (!is_received(0x779)) { // HIUMonitor
has_update(telegram, wwCurFlow_, 11); has_update(telegram, wwCurFlow_, 11);
}
has_update(telegram, wwWorkM_, 14, 3); // force to 3 bytes has_update(telegram, wwWorkM_, 14, 3); // force to 3 bytes
has_update(telegram, wwStarts_, 17, 3); // force to 3 bytes has_update(telegram, wwStarts_, 17, 3); // force to 3 bytes

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.5-dev.3" #define EMSESP_APP_VERSION "3.6.5-dev.4"