Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2

2025-12-08 00:39:50 +03:00 · 2023-11-11 13:52:22 +01:00
parent 4c83f5fe60 981d62dc2c
commit 5b1f3d266e
8 changed files with 136 additions and 33 deletions
--- a/interface/package.json
+++ b/interface/package.json
@@ -20,7 +20,7 @@
  },
  "dependencies": {
    "@alova/adapter-xhr": "^1.0.1",
-    "@babel/core": "^7.23.2",
+    "@babel/core": "^7.23.3",
    "@emotion/react": "^11.11.1",
    "@emotion/styled": "^11.11.0",
    "@mui/icons-material": "^5.14.16",
@@ -28,9 +28,9 @@
    "@table-library/react-table-library": "4.1.7",
    "@types/imagemin": "^8.0.4",
    "@types/lodash-es": "^4.17.11",
-    "@types/node": "^20.8.10",
-    "@types/react": "^18.2.36",
-    "@types/react-dom": "^18.2.14",
+    "@types/node": "^20.9.0",
+    "@types/react": "^18.2.37",
+    "@types/react-dom": "^18.2.15",
    "@types/react-router-dom": "^5.3.3",
    "alova": "^2.13.1",
    "async-validator": "^4.2.5",
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -46,7 +46,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@babel/core@npm:^7.22.1, @babel/core@npm:^7.23.2":
+"@babel/core@npm:^7.22.1":
  version: 7.23.2
  resolution: "@babel/core@npm:7.23.2"
  dependencies:
@@ -69,6 +69,29 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/core@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/core@npm:7.23.3"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.22.13"
+    "@babel/generator": "npm:^7.23.3"
+    "@babel/helper-compilation-targets": "npm:^7.22.15"
+    "@babel/helper-module-transforms": "npm:^7.23.3"
+    "@babel/helpers": "npm:^7.23.2"
+    "@babel/parser": "npm:^7.23.3"
+    "@babel/template": "npm:^7.22.15"
+    "@babel/traverse": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.3"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: f9e7016b62842d23f78c98dc31daa3bd9161c5770c1e9df0557f78186ed75fd2cfc8e7161975fe8c6ad147665b1881790139da91de34ec03cf8b9f6a256d86eb
+  languageName: node
+  linkType: hard
+
 "@babel/generator@npm:^7.23.0":
  version: 7.23.0
  resolution: "@babel/generator@npm:7.23.0"
@@ -81,6 +104,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/generator@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/generator@npm:7.23.3"
+  dependencies:
+    "@babel/types": "npm:^7.23.3"
+    "@jridgewell/gen-mapping": "npm:^0.3.2"
+    "@jridgewell/trace-mapping": "npm:^0.3.17"
+    jsesc: "npm:^2.5.1"
+  checksum: 0f815d275cb3de97ec4724b959b3c7a67b1cde1861eda6612b50c6ba22565f12536d1f004dd48e7bad5e059751950265c6ff546ef48b7a719a11d7b512f1e29d
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.22.5":
  version: 7.22.5
  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -153,6 +188,21 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/helper-module-transforms@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+  dependencies:
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-module-imports": "npm:^7.22.15"
+    "@babel/helper-simple-access": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 583fa580f8e50e6f45c4f46aa76a8e49c2528deb84e25f634d66461b9a0e2420e13979b0a607b67aef67eaf8db8668eb9edc038b4514b16e3879fe09e8fd294b
+  languageName: node
+  linkType: hard
+
 "@babel/helper-plugin-utils@npm:^7.22.5":
  version: 7.22.5
  resolution: "@babel/helper-plugin-utils@npm:7.22.5"
@@ -230,6 +280,15 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/parser@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/parser@npm:7.23.3"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 284c22ec1d939df66fb94929959d2160c30df1ba5778f212668dfb2f4aa8ac176f628c6073a2c9ea7ab2a1701d2ebdafb0dfb173dc737db9dc6708d5d2f49e0a
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-syntax-jsx@npm:^7.22.5":
  version: 7.22.5
  resolution: "@babel/plugin-syntax-jsx@npm:7.22.5"
@@ -305,6 +364,24 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/traverse@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/traverse@npm:7.23.3"
+  dependencies:
+    "@babel/code-frame": "npm:^7.22.13"
+    "@babel/generator": "npm:^7.23.3"
+    "@babel/helper-environment-visitor": "npm:^7.22.20"
+    "@babel/helper-function-name": "npm:^7.23.0"
+    "@babel/helper-hoist-variables": "npm:^7.22.5"
+    "@babel/helper-split-export-declaration": "npm:^7.22.6"
+    "@babel/parser": "npm:^7.23.3"
+    "@babel/types": "npm:^7.23.3"
+    debug: "npm:^4.1.0"
+    globals: "npm:^11.1.0"
+  checksum: 522ef8eefe1ed31cd392129efb2f8794ca25bd54b1ad7c3bfa7f46d20c47ef0e392d5c1654ddee3454eed5e546d04c9bfa38b04b82e47144aa545f87ba55572d
+  languageName: node
+  linkType: hard
+
 "@babel/types@npm:^7.22.15, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.8.3":
  version: 7.23.0
  resolution: "@babel/types@npm:7.23.0"
@@ -316,6 +393,17 @@ __metadata:
  languageName: node
  linkType: hard

+"@babel/types@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/types@npm:7.23.3"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.22.5"
+    "@babel/helper-validator-identifier": "npm:^7.22.20"
+    to-fast-properties: "npm:^2.0.0"
+  checksum: 05ec1527d0468aa6f3e30fa821625322794055fb572c131aaa8befdf24d174407e2e5954c2b0a292a5456962e23383e36cf9d7cbb01318146d6140ce2128d000
+  languageName: node
+  linkType: hard
+
 "@emotion/babel-plugin@npm:^11.11.0":
  version: 11.11.0
  resolution: "@emotion/babel-plugin@npm:11.11.0"
@@ -1306,12 +1394,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/node@npm:^20.8.10":
-  version: 20.8.10
-  resolution: "@types/node@npm:20.8.10"
+"@types/node@npm:^20.9.0":
+  version: 20.9.0
+  resolution: "@types/node@npm:20.9.0"
  dependencies:
    undici-types: "npm:~5.26.4"
-  checksum: 8930039077c8ad74de74c724909412bea8110c3f8892bcef8dda3e9629073bed65632ee755f94b252bcdae8ca71cf83e89a4a440a105e2b1b7c9797b43483049
+  checksum: a934f7645ed117a27857147403b0c657ffbca578c8f280e4c21d27dfb43e58dc4f24c4319d4335b8a4fa08e28fb2dc905a5bd5e4bc8878047164c56c1b162139
  languageName: node
  linkType: hard

@@ -1329,12 +1417,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/react-dom@npm:^18.2.14":
-  version: 18.2.14
-  resolution: "@types/react-dom@npm:18.2.14"
+"@types/react-dom@npm:^18.2.15":
+  version: 18.2.15
+  resolution: "@types/react-dom@npm:18.2.15"
  dependencies:
    "@types/react": "npm:*"
-  checksum: c7feb6542dbeb3de18c9c03260229377e0a0d47a3d2c0bb91861996e2353375a45c57de7216edb8b88448584e363677244bd4355ddec45c243e70e777c2a150b
+  checksum: 57ea7e9e210d95fa18fde82fc585cb6252c9118c8793a38b37b07ccbba05d09d14f88cf76af46eecda41c430b4400f789a4bbc505eec459a15cbaf13f56f887a
  languageName: node
  linkType: hard

@@ -1379,14 +1467,14 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/react@npm:^18.2.36":
-  version: 18.2.36
-  resolution: "@types/react@npm:18.2.36"
+"@types/react@npm:^18.2.37":
+  version: 18.2.37
+  resolution: "@types/react@npm:18.2.37"
  dependencies:
    "@types/prop-types": "npm:*"
    "@types/scheduler": "npm:*"
    csstype: "npm:^3.0.2"
-  checksum: 4dac0a9f808b0da01029146efe7eeed454da68d01f0f73d417c95d691460f210b9baeb5fa756015f5a048825a1145a7dcb6c6d9c3e4e7876c683edf9892c383b
+  checksum: fab3a5960e710aad6c16ffe57f48a470c6bbbe9e6363f70accf114191ea3192a204e33b5657324f14e64b2095986327db6b728fc15156e05f7d30b6dca0d66a3
  languageName: node
  linkType: hard

@@ -1556,7 +1644,7 @@ __metadata:
  resolution: "EMS-ESP@workspace:."
  dependencies:
    "@alova/adapter-xhr": "npm:^1.0.1"
-    "@babel/core": "npm:^7.23.2"
+    "@babel/core": "npm:^7.23.3"
    "@emotion/react": "npm:^11.11.1"
    "@emotion/styled": "npm:^11.11.0"
    "@mui/icons-material": "npm:^5.14.16"
@@ -1566,9 +1654,9 @@ __metadata:
    "@table-library/react-table-library": "npm:4.1.7"
    "@types/imagemin": "npm:^8.0.4"
    "@types/lodash-es": "npm:^4.17.11"
-    "@types/node": "npm:^20.8.10"
-    "@types/react": "npm:^18.2.36"
-    "@types/react-dom": "npm:^18.2.14"
+    "@types/node": "npm:^20.9.0"
+    "@types/react": "npm:^18.2.37"
+    "@types/react-dom": "npm:^18.2.15"
    "@types/react-router-dom": "npm:^5.3.3"
    "@typescript-eslint/eslint-plugin": "npm:^6.10.0"
    "@typescript-eslint/parser": "npm:^6.10.0"
--- a/lib_standalone/Arduino.h
+++ b/lib_standalone/Arduino.h
@@ -24,6 +24,7 @@
 #include <cstdint>
 #include <cstring>
 #include <string>
+#include <math.h>

 #include <algorithm> // for count_if

@@ -187,4 +188,6 @@ void yield(void);
 void setup(void);
 void loop(void);

+
+
 #endif
--- a/lib_standalone/ESP8266React.h
+++ b/lib_standalone/ESP8266React.h
@@ -63,6 +63,7 @@ class DummySettings {
    String jwtSecret      = "ems-esp";
    String ssid           = "ems-esp";
    String password       = "ems-esp";
+    String bssid          = "";
    String localIP        = "";
    String gatewayIP      = "";
    String subnetMask     = "";
--- a/lib_standalone/Preferences.h
+++ b/lib_standalone/Preferences.h
@@ -45,6 +45,20 @@ class Preferences {
        return NAN;
    }

+    size_t putString(const char * key, const char * value) {
+        return 0;
+    }
+    size_t putString(const char * key, String value) {
+        return 0;
+    }
+
+    size_t getString(const char * key, char * value, size_t maxLen) {
+        return 0;
+    }
+    String getString(const char * key, String defaultValue = String()) {
+        return "";
+    }
+
    // unused

    // void           end();
@@ -59,8 +73,7 @@ class Preferences {
    // size_t         putULong64(const char * key, uint64_t value);
    // size_t         putFloat(const char * key, float_t value);
    // size_t         putBool(const char * key, bool value);
-    // size_t         putString(const char * key, const char * value);
-    // size_t         putString(const char * key, String value);
+
    // size_t         putBytes(const char * key, const void * value, size_t len);
    // bool           isKey(const char * key);
    // PreferenceType getType(const char * key);
@@ -75,8 +88,6 @@ class Preferences {
    // uint64_t       getULong64(const char * key, uint64_t defaultValue = 0);
    // float_t        getFloat(const char * key, float_t defaultValue = NAN);
    // bool           getBool(const char * key, bool defaultValue = false);
-    // size_t         getString(const char * key, char * value, size_t maxLen);
-    // String         getString(const char * key, String defaultValue = String());
    // size_t         getBytesLength(const char * key);
    // size_t         getBytes(const char * key, void * buf, size_t maxLen);
    // size_t         freeEntries();
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -481,7 +481,7 @@ void EMSESP::publish_all(bool force) {
        publish_device_values(EMSdevice::DeviceType::SOLAR);
        publish_device_values(EMSdevice::DeviceType::MIXER);
        publish_device_values(EMSdevice::DeviceType::WATER);
-        publish_other_values(); // switch and heat pump, ...
+        publish_other_values();      // switch and heat pump, ...
        publish_sensor_values(true); // includes temperature and analog sensors
        system_.send_heartbeat();
    }
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.3-dev.7a"
+#define EMSESP_APP_VERSION "3.6.3-test.7a"