3.6.4

emsesp · Nov 24, 2023 · 22c75e6 · 22c75e6
2 parents 5ab10b7 + 24cca67
commit 22c75e6
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 50 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -1 +1,11 @@
 # Changelog
+
+## [3.6.4]
+
+## **IMPORTANT! BREAKING CHANGES**
+
+## Added
+
+## Fixed
+
+## Changed
diff --git a/interface/package.json b/interface/package.json
@@ -29,11 +29,11 @@
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.9.4",
+    "@types/node": "^20.9.5",
     "@types/react": "^18.2.38",
     "@types/react-dom": "^18.2.17",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.13.2",
+    "alova": "^2.14.0",
     "async-validator": "^4.2.5",
     "history": "^5.3.0",
     "jwt-decode": "^4.0.0",
@@ -43,7 +43,7 @@
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
     "react-icons": "^4.12.0",
-    "react-router-dom": "^6.19.0",
+    "react-router-dom": "^6.20.0",
     "react-toastify": "^9.1.3",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",

diff --git a/interface/yarn.lock b/interface/yarn.lock
@@ -1112,10 +1112,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.12.0":
-  version: 1.12.0
-  resolution: "@remix-run/router@npm:1.12.0"
-  checksum: f984e42cfe855991e1d3067f686f857614f12e8c1c45168a2d98e3fc3a427e232fd0b6cf145173b7cd132faf070702b532c34230a825d933908c54c85077fc69
+"@remix-run/router@npm:1.13.0":
+  version: 1.13.0
+  resolution: "@remix-run/router@npm:1.13.0"
+  checksum: bb173a012d2036c5ee69babfe30c73975b970c2e5a0edaba138c302ae80d255e238e462e77365ab4efe819b6397e1a7f3a416d6200d17f9655f0ca1c51c4f45e
   languageName: node
   linkType: hard
 
@@ -1378,12 +1378,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+<<<<<<< HEAD
 "@types/node@npm:*, @types/node@npm:^20.9.4":
   version: 20.9.4
   resolution: "@types/node@npm:20.9.4"
+=======
+"@types/node@npm:*":
+  version: 20.8.9
+  resolution: "@types/node@npm:20.8.9"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: d567855b48e453b443499c17fc6c939d154732b54319a05b9b31db6e475e6458f053838635b201b1bb493d349d9b1af0aecc58b28fd6062e564e9fbf593199eb
+  checksum: 71e0023342272e63c47f3fab6082bd6c89d0b0c4262a1c2d0d52458560077f5c28ef5cfe704306eac43fc2e5111bef4e1cdbf08f565650520fad5e54005a8836
+  languageName: node
+  linkType: hard
+
+"@types/node@npm:^20.9.5":
+  version: 20.9.5
+  resolution: "@types/node@npm:20.9.5"
+>>>>>>> origin/dev
+  dependencies:
+    undici-types: "npm:~5.26.4"
+  checksum: f7d02ef84a449f079bc77d7494dc96a1d45006b3a7583a41430d8b62ad7dd914bcce8d1ed60584b8725289e609c20288c840aadb21cc52d5b656fa7731c1a528
   languageName: node
   linkType: hard
 
@@ -1627,13 +1642,13 @@ __metadata:
     "@table-library/react-table-library": "npm:4.1.7"
     "@types/imagemin": "npm:^8.0.5"
     "@types/lodash-es": "npm:^4.17.12"
-    "@types/node": "npm:^20.9.4"
+    "@types/node": "npm:^20.9.5"
     "@types/react": "npm:^18.2.38"
     "@types/react-dom": "npm:^18.2.17"
     "@types/react-router-dom": "npm:^5.3.3"
     "@typescript-eslint/eslint-plugin": "npm:^6.12.0"
     "@typescript-eslint/parser": "npm:^6.12.0"
-    alova: "npm:^2.13.2"
+    alova: "npm:^2.14.0"
     async-validator: "npm:^4.2.5"
     concurrently: "npm:^8.2.2"
     eslint: "npm:^8.54.0"
@@ -1657,7 +1672,7 @@ __metadata:
     react-dom: "npm:latest"
     react-dropzone: "npm:^14.2.3"
     react-icons: "npm:^4.12.0"
-    react-router-dom: "npm:^6.19.0"
+    react-router-dom: "npm:^6.20.0"
     react-toastify: "npm:^9.1.3"
     rollup-plugin-visualizer: "npm:^5.9.2"
     sockette: "npm:^2.0.6"
@@ -1726,10 +1741,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alova@npm:^2.13.2":
-  version: 2.13.2
-  resolution: "alova@npm:2.13.2"
-  checksum: 09d3949b20094833ae9a2861b7408b6697e2e7fa677d6bbb31a7c43a756bef1033a999a9aa94aff94f392eb5186f9ae2e63a381560fd42c59987948740f6a043
+"alova@npm:^2.14.0":
+  version: 2.14.0
+  resolution: "alova@npm:2.14.0"
+  checksum: 64482346dece670676908b00df93aba10f5da5f65f1b0b79673ac4f494969acfeefb87f5db1dea01de06e6bdca67e122fe8835fc10c1e7dc5202a8d8eeba92d8
   languageName: node
   linkType: hard
 
@@ -6810,27 +6825,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.19.0":
-  version: 6.19.0
-  resolution: "react-router-dom@npm:6.19.0"
+"react-router-dom@npm:^6.20.0":
+  version: 6.20.0
+  resolution: "react-router-dom@npm:6.20.0"
   dependencies:
-    "@remix-run/router": "npm:1.12.0"
-    react-router: "npm:6.19.0"
+    "@remix-run/router": "npm:1.13.0"
+    react-router: "npm:6.20.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 38312efc11d3ef688062301479a8257a1495a81cd8dd7039c1f81aba6774963df7d21aaee2ba1a3c152857b70f4fb9966a3ccff47aca12212e854dcd6fc4deab
+  checksum: 4b6741c545cedf5a5c4f996deb953679dcc985425e0664e27b97fdb9ab1387cbe1a6a12bfc7f7c38ec40b15759b4bf6396930ec26540a4a81ae16d154fd35049
   languageName: node
   linkType: hard
 
-"react-router@npm:6.19.0":
-  version: 6.19.0
-  resolution: "react-router@npm:6.19.0"
+"react-router@npm:6.20.0":
+  version: 6.20.0
+  resolution: "react-router@npm:6.20.0"
   dependencies:
-    "@remix-run/router": "npm:1.12.0"
+    "@remix-run/router": "npm:1.13.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 5454f4a4d65401430ded8f1033cebe4ccca771c3c827e8329c77dcfd73618ca9a32488fb58722bf6a07afef7d8e7ef22a710aae0f3337e5c20962bf6473d81a3
+  checksum: 2cdac5ad8b7a7bc230173b26768bcf3f6a9abc0a19983fa7b76b9ffdbeb44bfbd88fcc2033e9062defafef144db207859eb3162a9c9742d70cfce4e7166ff1e5
   languageName: node
   linkType: hard
 

diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
@@ -2001,7 +2001,7 @@ bool Boiler::set_ww_temp(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         // write_command(EMS_TYPE_UBAFlags, 3, v, EMS_TYPE_UBAParameterWWPlus); // test for #96
         write_command(EMS_TYPE_UBAParameterWWPlus, 6, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
@@ -2054,7 +2054,7 @@ bool Boiler::set_ww_disinfect_temp(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 12, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 8, v, EMS_TYPE_UBAParameterWW);
@@ -2104,7 +2104,7 @@ bool Boiler::set_ww_flowTempOffset(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 9, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 5, v, EMS_TYPE_UBAParameterWW);
@@ -2120,7 +2120,7 @@ bool Boiler::set_heating_activated(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 0, v ? 0x01 : 0, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 0, v ? 0xFF : 0, EMS_TYPE_UBAParameters);
@@ -2136,7 +2136,7 @@ bool Boiler::set_heating_temp(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 1, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 1, v, EMS_TYPE_UBAParameters);
@@ -2152,7 +2152,7 @@ bool Boiler::set_min_power(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 5, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 3, v, EMS_TYPE_UBAParameters);
@@ -2168,7 +2168,7 @@ bool Boiler::set_max_power(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 4, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 2, v, EMS_TYPE_UBAParameters);
@@ -2184,7 +2184,7 @@ bool Boiler::set_ww_hyst_on(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 7, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 3, v, EMS_TYPE_UBAParameterWW);
@@ -2200,7 +2200,7 @@ bool Boiler::set_ww_hyst_off(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 8, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 4, v, EMS_TYPE_UBAParameterWW);
@@ -2216,7 +2216,7 @@ bool Boiler::set_ww_chargeOptimization(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 25, v ? 1 : 0, EMS_TYPE_UBAParameterWWPlus);
     }
 
@@ -2254,7 +2254,7 @@ bool Boiler::set_min_pump(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 14, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 10, v, EMS_TYPE_UBAParameters);
@@ -2270,7 +2270,7 @@ bool Boiler::set_max_pump(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 13, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 9, v, EMS_TYPE_UBAParameters);
@@ -2295,7 +2295,7 @@ bool Boiler::set_hyst_on(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 9, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, id == 2 ? 13 : 5, v, EMS_TYPE_UBAParameters);
@@ -2311,7 +2311,7 @@ bool Boiler::set_hyst_off(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 8, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, id == 2 ? 12 : 4, v, EMS_TYPE_UBAParameters);
@@ -2327,7 +2327,7 @@ bool Boiler::set_burn_period(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParametersPlus)) {
+    if (is_received(EMS_TYPE_UBAParametersPlus)) {
         write_command(EMS_TYPE_UBAParametersPlus, 10, v, EMS_TYPE_UBAParametersPlus);
     } else {
         write_command(EMS_TYPE_UBAParameters, 6, v, EMS_TYPE_UBAParameters);
@@ -2343,7 +2343,7 @@ bool Boiler::set_pump_delay(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameters)) {
+    if (is_received(EMS_TYPE_UBAParameters)) {
         write_command(EMS_TYPE_UBAParameters, 8, v, EMS_TYPE_UBAParameters);
         return true;
     }
@@ -2359,7 +2359,7 @@ bool Boiler::set_ww_mode(const char * value, const int8_t id) {
     uint8_t set;
     uint8_t comfort[] = {0x00, 0xD8, 0xEC}; // heat, eco, intelligent
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         if (Helpers::value2enum(value, set, FL_(enum_comfort1))) {
             write_command(EMS_TYPE_UBAParameterWWPlus, 13, comfort[set], EMS_TYPE_UBAParameterWWPlus);
             write_command(0x05, 70, set ? 0xAA : 0x55); //
@@ -2383,7 +2383,7 @@ bool Boiler::set_ww_activated(const char * value, const int8_t id) {
 
     // https://github.com/emsesp/EMS-ESP/issues/268
     // 08 for HT3 seems to be wrong, see https://github.com/emsesp/EMS-ESP32/issues/89
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 5, v ? 1 : 0, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 1, v ? 0xFF : 0, EMS_TYPE_UBAParameterWW);
@@ -2441,7 +2441,7 @@ bool Boiler::set_ww_onetime(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAFlags, 0, (v ? 0x22 : 0x02), 0xE9); // not sure if this is in flags
     } else {
         write_command(EMS_TYPE_UBAFlags, 0, (v ? 0x23 : 0x03), 0x34);
@@ -2457,7 +2457,7 @@ bool Boiler::set_ww_disinfect(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAFlags, 0, (v ? 0x44 : 0x04), 0xE9); // not sure if this is in flags
     } else {
         write_command(EMS_TYPE_UBAFlags, 0, (v ? 0x44 : 0x04), 0x34);
@@ -2474,7 +2474,7 @@ bool Boiler::set_ww_circulation(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAFlags, 1, (v ? 0x22 : 0x02), 0xE9); // not sure if this is in flags
     } else {
         write_command(EMS_TYPE_UBAFlags, 1, (v ? 0x22 : 0x02), 0x34);
@@ -2490,7 +2490,7 @@ bool Boiler::set_ww_circulation_pump(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 10, v ? 0x01 : 0x00, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 6, v ? 0xFF : 0x00, EMS_TYPE_UBAParameterWW);
@@ -2507,7 +2507,7 @@ bool Boiler::set_ww_circulation_mode(const char * value, const int8_t id) {
         return false;
     }
 
-    if (is_fetch(EMS_TYPE_UBAParameterWWPlus)) {
+    if (is_received(EMS_TYPE_UBAParameterWWPlus)) {
         write_command(EMS_TYPE_UBAParameterWWPlus, 11, v, EMS_TYPE_UBAParameterWWPlus);
     } else {
         write_command(EMS_TYPE_UBAParameterWW, 7, v, EMS_TYPE_UBAParameterWW);

diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.3"
+#define EMSESP_APP_VERSION "3.6.4"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define EMSESP_APP_VERSION "3.6.3"
		#define EMSESP_APP_VERSION "3.6.4"