From cdaf10a92ad3ffcf4d63741e644c0e56e89eca59 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 5 Aug 2024 18:20:55 +0200 Subject: [PATCH 1/4] Fix: Wifi reconnect issue introduced with #2117 and discussed in #2185 was fixed --- src/NetworkSettings.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp index 8ae1c909..55ea428e 100644 --- a/src/NetworkSettings.cpp +++ b/src/NetworkSettings.cpp @@ -79,8 +79,8 @@ void NetworkSettingsClass::NetworkEvent(const WiFiEvent_t event) MessageOutput.println("WiFi disconnected"); if (_networkMode == network_mode::WiFi) { MessageOutput.println("Try reconnecting"); - WiFi.disconnect(true, true); - WiFi.reconnect(); + WiFi.disconnect(true, false); + WiFi.begin(); raiseEvent(network_event::NETWORK_DISCONNECTED); } break; From e279cf5cec269e56b7afc0ab09013af7adabdf3d Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 5 Aug 2024 18:28:14 +0200 Subject: [PATCH 2/4] Added hint in issue template that HMS-xxxW inverters are not supported --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 544684f4..5e73566e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -84,3 +84,5 @@ body: required: true - label: I have updated the title field above with a concise description. required: true + - label: I have double checked that my inverter does not contain a W in the model name (like HMS-xxxW) as they are not supported + required: true From 0bb3fc8b94a372a6b7492427d61541cd65cc2813 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 5 Aug 2024 18:29:37 +0200 Subject: [PATCH 3/4] Fixed documentation for webapp dev mode --- webapp/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/README.md b/webapp/README.md index 1729f905..d342f47d 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -1,6 +1,6 @@ # OpenDTU web frontend -You can run the webapp locally with `yarn dev`. If you enter the IP of your ESP in the `vite.config.ts` beforehand, all api requests will even be proxied to the real ESP. Then you can develop the webapp as if it were running directly on the ESP. The `yarn dev` also supports hot reload, i.e. as soon as you save a vue file, it is automatically reloaded in the browser. +You can run the webapp locally with `yarn dev`. If you enter the IP of your ESP in the `vite.user.ts` beforehand (template can be found in `vite.config.ts`), all api requests will even be proxied to the real ESP. Then you can develop the webapp as if it were running directly on the ESP. The `yarn dev` also supports hot reload, i.e. as soon as you save a vue file, it is automatically reloaded in the browser. ## Project Setup @@ -24,4 +24,4 @@ yarn build ```sh yarn lint -``` \ No newline at end of file +``` From 0cc55f3b8723723aea234954eaf7ab6cd13b53a4 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 5 Aug 2024 18:30:42 +0200 Subject: [PATCH 4/4] webapp: update dependencies --- webapp/package.json | 2 +- webapp/yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 19608f39..a427ce2c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -27,7 +27,7 @@ "@intlify/unplugin-vue-i18n": "^4.0.0", "@tsconfig/node18": "^18.2.4", "@types/bootstrap": "^5.2.10", - "@types/node": "^22.0.2", + "@types/node": "^22.1.0", "@types/pulltorefreshjs": "^0.1.7", "@types/sortablejs": "^1.15.8", "@types/spark-md5": "^3.0.4", diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 05f9deb9..ac50d1d0 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -449,12 +449,12 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== -"@types/node@^22.0.2": - version "22.0.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-22.0.2.tgz#9fb1a2b31970871e8bf696f0e8a40d2e6d2bd04e" - integrity sha512-yPL6DyFwY5PiMVEwymNeqUTKsDczQBJ/5T7W/46RwLU/VH+AA8aT5TZkvBviLKLbbm0hlfftEkGrNzfRk/fofQ== +"@types/node@^22.1.0": + version "22.1.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-22.1.0.tgz#6d6adc648b5e03f0e83c78dc788c2b037d0ad94b" + integrity sha512-AOmuRF0R2/5j1knA3c6G3HOk523Ga+l+ZXltX8SF1+5oqcXijjfTd8fY3XRZqSihEu9XhtQnKYLmkFaoxgsJHw== dependencies: - undici-types "~6.11.1" + undici-types "~6.13.0" "@types/pulltorefreshjs@^0.1.7": version "0.1.7" @@ -2507,10 +2507,10 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -undici-types@~6.11.1: - version "6.11.1" - resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.11.1.tgz#432ea6e8efd54a48569705a699e62d8f4981b197" - integrity sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ== +undici-types@~6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.13.0.tgz#e3e79220ab8c81ed1496b5812471afd7cf075ea5" + integrity sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg== universalify@^2.0.0: version "2.0.0"