From 184c65919770d1f84ebdedc774af7376f0471988 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 19 Jun 2023 11:33:06 +0200 Subject: [PATCH 1/8] Added new found HMS-400 to DevInfoParser Fixes #1045 --- lib/Hoymiles/src/parser/DevInfoParser.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Hoymiles/src/parser/DevInfoParser.cpp b/lib/Hoymiles/src/parser/DevInfoParser.cpp index 0c1a10f54..d5994dcab 100644 --- a/lib/Hoymiles/src/parser/DevInfoParser.cpp +++ b/lib/Hoymiles/src/parser/DevInfoParser.cpp @@ -29,6 +29,7 @@ const devInfo_t devInfo[] = { { { 0x10, 0x10, 0x10, 0x15 }, static_cast(300 * 0.7), "HM-300" }, // HM-300 factory limitted to 70% { { 0x10, 0x20, 0x21, ALL }, 350, "HMS-350" }, // 00 + { { 0x10, 0x20, 0x41, ALL }, 400, "HMS-400" }, // 00 { { 0x10, 0x10, 0x51, ALL }, 450, "HMS-450" }, // 01 { { 0x10, 0x10, 0x71, ALL }, 500, "HMS-500" }, // 02 { { 0x10, 0x21, 0x11, ALL }, 600, "HMS-600" }, // 01 From 915b084af54b7055e31ea343ea4657d8c5b20c1a Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 19 Jun 2023 11:35:48 +0200 Subject: [PATCH 2/8] webapp: Update dependencies --- webapp/package.json | 8 +- webapp/yarn.lock | 186 +++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 112 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index fbd1c2177..88a6237e7 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -23,7 +23,7 @@ }, "devDependencies": { "@intlify/unplugin-vue-i18n": "^0.11.0", - "@rushstack/eslint-patch": "^1.3.1", + "@rushstack/eslint-patch": "^1.3.2", "@tsconfig/node18": "^2.0.1", "@types/bootstrap": "^5.2.6", "@types/node": "^20.3.1", @@ -32,8 +32,8 @@ "@vitejs/plugin-vue": "^4.2.3", "@vue/eslint-config-typescript": "^11.0.3", "@vue/tsconfig": "^0.4.0", - "eslint": "^8.42.0", - "eslint-plugin-vue": "^9.14.1", + "eslint": "^8.43.0", + "eslint-plugin-vue": "^9.15.0", "npm-run-all": "^4.1.5", "sass": "^1.63.4", "terser": "^5.18.0", @@ -41,6 +41,6 @@ "vite": "^4.3.9", "vite-plugin-compression": "^0.5.1", "vite-plugin-css-injected-by-js": "^3.1.1", - "vue-tsc": "^1.6.5" + "vue-tsc": "^1.8.0" } } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 87cca0574..affe54c5c 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -156,10 +156,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.42.0": - version "8.42.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6" - integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw== +"@eslint/js@8.43.0": + version "8.43.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0" + integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg== "@humanwhocodes/config-array@^0.11.10": version "0.11.10" @@ -345,10 +345,10 @@ estree-walker "^2.0.2" picomatch "^2.3.1" -"@rushstack/eslint-patch@^1.3.1": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.3.1.tgz#edbb85ff95f3be41eaa70c6d6ad6d8ba0a9c7e46" - integrity sha512-RkmuBcqiNioeeBKbgzMlOdreUkJfYaSjwgx9XDgGGpjvWgyaxWvDmZVSN9CS6LjEASadhgPv2BcFp+SeouWXXA== +"@rushstack/eslint-patch@^1.3.2": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@rushstack/eslint-patch/-/eslint-patch-1.3.2.tgz#31b9c510d8cada9683549e1dbb4284cca5001faf" + integrity sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw== "@tsconfig/node18@^2.0.1": version "2.0.1" @@ -481,49 +481,26 @@ resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.2.3.tgz#ee0b6dfcc62fe65364e6395bf38fa2ba10bb44b6" integrity sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw== -"@volar/language-core@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.4.1.tgz#66b5758252e35c4e5e71197ca7fa0344d306442c" - integrity sha512-EIY+Swv+TjsWpxOxujjMf1ZXqOjg9MT2VMXZ+1dKva0wD8W0L6EtptFFcCJdBbcKmGMFkr57Qzz9VNMWhs3jXQ== +"@volar/language-core@1.7.6": + version "1.7.6" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.7.6.tgz#71da3e34e8e9f676378c7a7dae1a8eb5511dbd3c" + integrity sha512-r+82YGjae8ALzaX+TaESpeBOrp/H5MQnPYZLq4WKd8rsPrCAPbMwelwHLHhFpyjy66BK/cKreJAcvOc6YEwyFA== dependencies: - "@volar/source-map" "1.4.1" + "@volar/source-map" "1.7.6" -"@volar/source-map@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.4.1.tgz#e3b561775c742508e5e1f28609a4787c98056715" - integrity sha512-bZ46ad72dsbzuOWPUtJjBXkzSQzzSejuR3CT81+GvTEI2E994D8JPXzM3tl98zyCNnjgs4OkRyliImL1dvJ5BA== +"@volar/source-map@1.7.6": + version "1.7.6" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.7.6.tgz#e64e663d4ddb2620f771d7b9560ccc2c8ffcdd2e" + integrity sha512-6oGrgz+hg5GCzP8D2+ay7vOdIOA9/aXwpa22Wx5b6d4ZGwwosBqv7kVs8AyMh5zOSQpKhrImE1pfagpu+V+rBQ== dependencies: - muggle-string "^0.2.2" + muggle-string "^0.3.1" -"@volar/typescript@1.4.1-patch.2": - version "1.4.1-patch.2" - resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.4.1-patch.2.tgz#89f4bd199ca81a832d86d1449b01f49f2b72137c" - integrity sha512-lPFYaGt8OdMEzNGJJChF40uYqMO4Z/7Q9fHPQC/NRVtht43KotSXLrkPandVVMf9aPbiJ059eAT+fwHGX16k4w== +"@volar/typescript@1.7.6": + version "1.7.6" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.7.6.tgz#2cf652831cf8b77915104eca215909677b3d9a0e" + integrity sha512-JkBRQe2GYSEgamW84tDk4XQ/7abQJw09czLQCgL1jfjndhaV4DuAet2I3pvQv41OjodVc59W0+E3hylrlNsgWA== dependencies: - "@volar/language-core" "1.4.1" - -"@volar/vue-language-core@1.6.5": - version "1.6.5" - resolved "https://registry.yarnpkg.com/@volar/vue-language-core/-/vue-language-core-1.6.5.tgz#db42520f1a29737c7e40fbb3e6aead8def85ba75" - integrity sha512-IF2b6hW4QAxfsLd5mePmLgtkXzNi+YnH6ltCd80gb7+cbdpFMjM1I+w+nSg2kfBTyfu+W8useCZvW89kPTBpzg== - dependencies: - "@volar/language-core" "1.4.1" - "@volar/source-map" "1.4.1" - "@vue/compiler-dom" "^3.3.0" - "@vue/compiler-sfc" "^3.3.0" - "@vue/reactivity" "^3.3.0" - "@vue/shared" "^3.3.0" - minimatch "^9.0.0" - muggle-string "^0.2.2" - vue-template-compiler "^2.7.14" - -"@volar/vue-typescript@1.6.5": - version "1.6.5" - resolved "https://registry.yarnpkg.com/@volar/vue-typescript/-/vue-typescript-1.6.5.tgz#6ca9bfefa5dc64ff97fcdbc74249e5e7da44e533" - integrity sha512-er9rVClS4PHztMUmtPMDTl+7c7JyrxweKSAEe/o/Noeq2bQx6v3/jZHVHBe8ZNUti5ubJL/+Tg8L3bzmlalV8A== - dependencies: - "@volar/typescript" "1.4.1-patch.2" - "@volar/vue-language-core" "1.6.5" + "@volar/language-core" "1.7.6" "@vue/compiler-core@3.2.47": version "3.2.47" @@ -563,14 +540,6 @@ "@vue/compiler-core" "3.2.47" "@vue/shared" "3.2.47" -"@vue/compiler-dom@3.3.2", "@vue/compiler-dom@^3.3.0": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.2.tgz#2012ef4879375a4ca4ee68012a9256398b848af2" - integrity sha512-6gS3auANuKXLw0XH6QxkWqyPYPunziS2xb6VRenM3JY7gVfZcJvkCBHkb5RuNY1FCbBO3lkIi0CdXUCW1c7SXw== - dependencies: - "@vue/compiler-core" "3.3.2" - "@vue/shared" "3.3.2" - "@vue/compiler-dom@3.3.4": version "3.3.4" resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151" @@ -579,6 +548,14 @@ "@vue/compiler-core" "3.3.4" "@vue/shared" "3.3.4" +"@vue/compiler-dom@^3.3.0": + version "3.3.2" + resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.3.2.tgz#2012ef4879375a4ca4ee68012a9256398b848af2" + integrity sha512-6gS3auANuKXLw0XH6QxkWqyPYPunziS2xb6VRenM3JY7gVfZcJvkCBHkb5RuNY1FCbBO3lkIi0CdXUCW1c7SXw== + dependencies: + "@vue/compiler-core" "3.3.2" + "@vue/shared" "3.3.2" + "@vue/compiler-sfc@3.3.4": version "3.3.4" resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df" @@ -611,22 +588,6 @@ postcss "^8.1.10" source-map "^0.6.1" -"@vue/compiler-sfc@^3.3.0": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.3.2.tgz#d6467acba8446655bcee7e751441232e5ddebcbf" - integrity sha512-jG4jQy28H4BqzEKsQqqW65BZgmo3vzdLHTBjF+35RwtDdlFE+Fk1VWJYUnDMMqkFBo6Ye1ltSKVOMPgkzYj7SQ== - dependencies: - "@babel/parser" "^7.20.15" - "@vue/compiler-core" "3.3.2" - "@vue/compiler-dom" "3.3.2" - "@vue/compiler-ssr" "3.3.2" - "@vue/reactivity-transform" "3.3.2" - "@vue/shared" "3.3.2" - estree-walker "^2.0.2" - magic-string "^0.30.0" - postcss "^8.1.10" - source-map-js "^1.0.2" - "@vue/compiler-ssr@3.2.47": version "3.2.47" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.47.tgz#35872c01a273aac4d6070ab9d8da918ab13057ee" @@ -635,14 +596,6 @@ "@vue/compiler-dom" "3.2.47" "@vue/shared" "3.2.47" -"@vue/compiler-ssr@3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.2.tgz#75ac4ccafa2d78c91d2e257ad243c86409493cc4" - integrity sha512-K8OfY5FQtZaSOJHHe8xhEfIfLrefL/Y9frv4k4NsyQL3+0lRKxr9QuJhfdBDjkl7Fhz8CzKh63mULvmOfx3l2w== - dependencies: - "@vue/compiler-dom" "3.3.2" - "@vue/shared" "3.3.2" - "@vue/compiler-ssr@3.3.4": version "3.3.4" resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777" @@ -670,6 +623,20 @@ "@typescript-eslint/parser" "^5.59.1" vue-eslint-parser "^9.1.1" +"@vue/language-core@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.0.tgz#3d106afdef859464435c90921fcce200a0b1d15c" + integrity sha512-rOAtqIRyyZ6OQreAkFDbbDt7L5BwvzrdbWaBAoEZjr4ImPBV9cRDBHxlMBU0SBOAZxIUQdjOvQ0uAl9uZDer0w== + dependencies: + "@volar/language-core" "1.7.6" + "@volar/source-map" "1.7.6" + "@vue/compiler-dom" "^3.3.0" + "@vue/reactivity" "^3.3.0" + "@vue/shared" "^3.3.0" + minimatch "^9.0.0" + muggle-string "^0.3.1" + vue-template-compiler "^2.7.14" + "@vue/reactivity-transform@3.2.47": version "3.2.47" resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.2.47.tgz#e45df4d06370f8abf29081a16afd25cffba6d84e" @@ -681,17 +648,6 @@ estree-walker "^2.0.2" magic-string "^0.25.7" -"@vue/reactivity-transform@3.3.2": - version "3.3.2" - resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.2.tgz#e1991d52d7ecefb65b214d8a3385a9dbe2cca74c" - integrity sha512-iu2WaQvlJHdnONrsyv4ibIEnSsuKF+aHFngGj/y1lwpHQtalpVhKg9wsKMoiKXS9zPNjG9mNKzJS9vudvjzvyg== - dependencies: - "@babel/parser" "^7.20.15" - "@vue/compiler-core" "3.3.2" - "@vue/shared" "3.3.2" - estree-walker "^2.0.2" - magic-string "^0.30.0" - "@vue/reactivity-transform@3.3.4": version "3.3.4" resolved "https://registry.yarnpkg.com/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929" @@ -762,6 +718,14 @@ resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.4.0.tgz#f01e2f6089b5098136fb084a0dd0cdd4533b72b0" integrity sha512-CPuIReonid9+zOG/CGTT05FXrPYATEqoDGNrEaqS4hwcw5BUNM2FguC0mOwJD4Jr16UpRVl9N0pY3P+srIbqmg== +"@vue/typescript@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@vue/typescript/-/typescript-1.8.0.tgz#0483abb622df89044509187960ca334d8b44662b" + integrity sha512-swi0NM+dpZCldXkMGS8wCxvoiRgA0PJw0UQeSTA7PqB2/5LsOQ8pmxyqLPE6YsbEdn0XqI9a7QgKOmmElkaMOA== + dependencies: + "@volar/typescript" "1.7.6" + "@vue/language-core" "1.8.0" + acorn-jsx@^5.2.0, acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -1125,10 +1089,10 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-vue@^9.14.1: - version "9.14.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.14.1.tgz#3b0c9857642dac547c7564031cfb09d283eafdd4" - integrity sha512-LQazDB1qkNEKejLe/b5a9VfEbtbczcOaui5lQ4Qw0tbRBbQYREyxxOV5BQgNDTqGPs9pxqiEpbMi9ywuIaF7vw== +eslint-plugin-vue@^9.15.0: + version "9.15.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-9.15.0.tgz#2bffe2b8a628ee438f983672a73cd89df455c461" + integrity sha512-XYzpK6e2REli100+6iCeBA69v6Sm0D/yK2FZP+fCeNt0yH/m82qZQq+ztseyV0JsKdhFysuSEzeE1yCmSC92BA== dependencies: "@eslint-community/eslint-utils" "^4.3.0" natural-compare "^1.4.0" @@ -1184,15 +1148,15 @@ eslint-visitor-keys@^3.4.1: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== -eslint@^8.42.0: - version "8.42.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291" - integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A== +eslint@^8.43.0: + version "8.43.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094" + integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.4.0" "@eslint/eslintrc" "^2.0.3" - "@eslint/js" "8.42.0" + "@eslint/js" "8.43.0" "@humanwhocodes/config-array" "^0.11.10" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" @@ -1882,10 +1846,10 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -muggle-string@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.2.2.tgz#786aa53fea1652c61c6a59e1f839292b262bc72a" - integrity sha512-YVE1mIJ4VpUMqZObFndk9CJu6DBJR/GB13p3tXuNbwD4XExaI5EOuRl6BHeIDxIqXZVxSfAC+y6U1Z/IxCfKUg== +muggle-string@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/muggle-string/-/muggle-string-0.3.1.tgz#e524312eb1728c63dd0b2ac49e3282e6ed85963a" + integrity sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg== nanoid@^3.3.4: version "3.3.4" @@ -2551,6 +2515,11 @@ vite@^4.3.9: optionalDependencies: fsevents "~2.3.2" +vscode-uri@^3.0.7: + version "3.0.7" + resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8" + integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA== + vue-eslint-parser@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz#3f4859be7e9bb7edaa1dc7edb05abffee72bf3dd" @@ -2602,14 +2571,15 @@ vue-template-compiler@^2.7.14: de-indent "^1.0.2" he "^1.2.0" -vue-tsc@^1.6.5: - version "1.6.5" - resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.6.5.tgz#cd18804b12087c300b6c9ee2a1da41a63f11103e" - integrity sha512-Wtw3J7CC+JM2OR56huRd5iKlvFWpvDiU+fO1+rqyu4V2nMTotShz4zbOZpW5g9fUOcjnyZYfBo5q5q+D/q27JA== +vue-tsc@^1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.0.tgz#0312964b67c8e2a3fe15ae5328f087f3cef93a5c" + integrity sha512-zRjRghohec71o+o3dzzqwFLtbKmJ1K1xRnq9ToHRdnHbBSZA2eUaTT1o+y4xOkBLZtW4cv7FkZE0FGCZfMrcBw== dependencies: - "@volar/vue-language-core" "1.6.5" - "@volar/vue-typescript" "1.6.5" + "@vue/language-core" "1.8.0" + "@vue/typescript" "1.8.0" semver "^7.3.8" + vscode-uri "^3.0.7" vue@^3.3.4: version "3.3.4" From 30fbd982741492981b1fa37d234903a378d0dbc8 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 19:56:14 +0200 Subject: [PATCH 3/8] Fix: Reboot loop occoured when no rf module was configured --- src/InverterSettings.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/InverterSettings.cpp b/src/InverterSettings.cpp index 52a37b5df..459b68228 100644 --- a/src/InverterSettings.cpp +++ b/src/InverterSettings.cpp @@ -28,10 +28,11 @@ void InverterSettingsClass::init() // Initialize inverter communication MessageOutput.print("Initialize Hoymiles interface... "); - if (PinMapping.isValidNrf24Config() || PinMapping.isValidCmt2300Config()) { - Hoymiles.setMessageOutput(&MessageOutput); - Hoymiles.init(); + Hoymiles.setMessageOutput(&MessageOutput); + Hoymiles.init(); + + if (PinMapping.isValidNrf24Config() || PinMapping.isValidCmt2300Config()) { if (PinMapping.isValidNrf24Config()) { SPIClass* spiClass = new SPIClass(SPI_NRF); spiClass->begin(pin.nrf24_clk, pin.nrf24_miso, pin.nrf24_mosi, pin.nrf24_cs); From e8fee49dc838a0ebe860b520c4700a19b04886d6 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 19:59:35 +0200 Subject: [PATCH 4/8] Allow the non-existence of the HOYMILES_PIN_ defines --- src/PinMapping.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/PinMapping.cpp b/src/PinMapping.cpp index 9cbcd8764..b9532d665 100644 --- a/src/PinMapping.cpp +++ b/src/PinMapping.cpp @@ -38,6 +38,30 @@ #define LED1 -1 #endif +#ifndef HOYMILES_PIN_SCLK +#define HOYMILES_PIN_SCLK -1 +#endif + +#ifndef HOYMILES_PIN_CS +#define HOYMILES_PIN_CS -1 +#endif + +#ifndef HOYMILES_PIN_CE +#define HOYMILES_PIN_CE -1 +#endif + +#ifndef HOYMILES_PIN_IRQ +#define HOYMILES_PIN_IRQ -1 +#endif + +#ifndef HOYMILES_PIN_MISO +#define HOYMILES_PIN_MISO -1 +#endif + +#ifndef HOYMILES_PIN_MOSI +#define HOYMILES_PIN_MOSI -1 +#endif + #ifndef CMT_CLK #define CMT_CLK -1 #endif From 7656735103df31f6ef28a323a614ab9c1ee26bd1 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 20:14:44 +0200 Subject: [PATCH 5/8] Pre-Compile a new generic esp32 binary without any pin config. --- platformio.ini | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/platformio.ini b/platformio.ini index ae2a623a2..d33506f99 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,14 +9,14 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = generic +default_envs = generic_esp32 extra_configs = platformio_override.ini [env] ; Make sure to NOT add any spaces in the custom_ci_action property ; (also the position in the file is important) -custom_ci_action = generic +custom_ci_action = generic,generic_esp32 framework = arduino platform = espressif32@6.3.1 @@ -54,15 +54,9 @@ upload_protocol = esptool ; upload_port = COM4 -[env:generic] +[env:generic_esp32] board = esp32dev build_flags = ${env.build_flags} - -DHOYMILES_PIN_MISO=19 - -DHOYMILES_PIN_MOSI=23 - -DHOYMILES_PIN_SCLK=18 - -DHOYMILES_PIN_IRQ=16 - -DHOYMILES_PIN_CE=4 - -DHOYMILES_PIN_CS=5 [env:generic_esp32c3] @@ -70,10 +64,28 @@ board = esp32dev board_build.mcu = esp32c3 custom_patches = esp32c3 build_flags = ${env.build_flags} - -DHOYMILES_PIN_MISO=9 - -DHOYMILES_PIN_MOSI=10 - -DHOYMILES_PIN_SCLK=8 - -DHOYMILES_PIN_IRQ=3 + + +[env:generic_esp32s3] +board = esp32-s3-devkitc-1 +build_flags = ${env.build_flags} + + +[env:generic_esp32s3_usb] +board = esp32-s3-devkitc-1 +upload_protocol = esp-builtin +build_flags = ${env.build_flags} + -DARDUINO_USB_MODE=1 + -DARDUINO_USB_CDC_ON_BOOT=1 + + +[env:generic] +board = esp32dev +build_flags = ${env.build_flags} + -DHOYMILES_PIN_MISO=19 + -DHOYMILES_PIN_MOSI=23 + -DHOYMILES_PIN_SCLK=18 + -DHOYMILES_PIN_IRQ=16 -DHOYMILES_PIN_CE=4 -DHOYMILES_PIN_CS=5 From e0b054d2b53273fab9d2a0f8258857aecf428836 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 20:31:31 +0200 Subject: [PATCH 6/8] Pre-Compile a new generic esp32s3 binary without any pin config. --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index d33506f99..cd46b6f9c 100644 --- a/platformio.ini +++ b/platformio.ini @@ -16,7 +16,7 @@ extra_configs = [env] ; Make sure to NOT add any spaces in the custom_ci_action property ; (also the position in the file is important) -custom_ci_action = generic,generic_esp32 +custom_ci_action = generic,generic_esp32,generic_esp32s3,generic_esp32s3_usb framework = arduino platform = espressif32@6.3.1 From 37b3b5abb916a55577f470d8208388994dfddf7d Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 20:38:52 +0200 Subject: [PATCH 7/8] webapp: Update dependencies --- webapp/package.json | 6 ++-- webapp/yarn.lock | 86 +++++++++++++++++++++------------------------ 2 files changed, 43 insertions(+), 49 deletions(-) diff --git a/webapp/package.json b/webapp/package.json index 88a6237e7..590181fbc 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -35,12 +35,12 @@ "eslint": "^8.43.0", "eslint-plugin-vue": "^9.15.0", "npm-run-all": "^4.1.5", - "sass": "^1.63.4", - "terser": "^5.18.0", + "sass": "^1.63.5", + "terser": "^5.18.1", "typescript": "^5.1.3", "vite": "^4.3.9", "vite-plugin-compression": "^0.5.1", "vite-plugin-css-injected-by-js": "^3.1.1", - "vue-tsc": "^1.8.0" + "vue-tsc": "^1.8.1" } } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index affe54c5c..8f82522d5 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -481,26 +481,26 @@ resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-4.2.3.tgz#ee0b6dfcc62fe65364e6395bf38fa2ba10bb44b6" integrity sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw== -"@volar/language-core@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.7.6.tgz#71da3e34e8e9f676378c7a7dae1a8eb5511dbd3c" - integrity sha512-r+82YGjae8ALzaX+TaESpeBOrp/H5MQnPYZLq4WKd8rsPrCAPbMwelwHLHhFpyjy66BK/cKreJAcvOc6YEwyFA== +"@volar/language-core@1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@volar/language-core/-/language-core-1.7.8.tgz#88e33fda749ecb1ecb28c031027d45e778b8cd5f" + integrity sha512-TPklg4c2e/f1xB/MGZEiQc3AWG+dH64ZfBlYjFB8nNaWJt4Z4k+IHBhmaP52APG+5PHFerwiWI9oF002RrRTPA== dependencies: - "@volar/source-map" "1.7.6" + "@volar/source-map" "1.7.8" -"@volar/source-map@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.7.6.tgz#e64e663d4ddb2620f771d7b9560ccc2c8ffcdd2e" - integrity sha512-6oGrgz+hg5GCzP8D2+ay7vOdIOA9/aXwpa22Wx5b6d4ZGwwosBqv7kVs8AyMh5zOSQpKhrImE1pfagpu+V+rBQ== +"@volar/source-map@1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@volar/source-map/-/source-map-1.7.8.tgz#46710f1d1e948e8009993595b70670e3ee4bfc1d" + integrity sha512-g2dtC2kOghvfzMDWeODIo4HO1Ml4hxzPTZyAFDz+YhRF9HjZYJSCaWaVuPZ+z0kY+T2daOHYA10GdrWQ5q0teA== dependencies: muggle-string "^0.3.1" -"@volar/typescript@1.7.6": - version "1.7.6" - resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.7.6.tgz#2cf652831cf8b77915104eca215909677b3d9a0e" - integrity sha512-JkBRQe2GYSEgamW84tDk4XQ/7abQJw09czLQCgL1jfjndhaV4DuAet2I3pvQv41OjodVc59W0+E3hylrlNsgWA== +"@volar/typescript@1.7.8": + version "1.7.8" + resolved "https://registry.yarnpkg.com/@volar/typescript/-/typescript-1.7.8.tgz#6997b3c7637292a6dc6e4a3737e45f3c4e49ef12" + integrity sha512-NDcI5ZQcdr8kgxzMQrhSSWIM8Tl0MbMFrkvJPTjfm2rdAQZPFT8zv3LrEW9Fqh0e9z2YbCry7jr4a/GShBqeDA== dependencies: - "@volar/language-core" "1.7.6" + "@volar/language-core" "1.7.8" "@vue/compiler-core@3.2.47": version "3.2.47" @@ -623,13 +623,13 @@ "@typescript-eslint/parser" "^5.59.1" vue-eslint-parser "^9.1.1" -"@vue/language-core@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.0.tgz#3d106afdef859464435c90921fcce200a0b1d15c" - integrity sha512-rOAtqIRyyZ6OQreAkFDbbDt7L5BwvzrdbWaBAoEZjr4ImPBV9cRDBHxlMBU0SBOAZxIUQdjOvQ0uAl9uZDer0w== +"@vue/language-core@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@vue/language-core/-/language-core-1.8.1.tgz#86b709f803bcc0cab84fd14677c0fb909154c562" + integrity sha512-pumv3k4J7P58hVh4YGRM9Qz3HaAr4TlFWM9bnVOkZ/2K9o2CK1lAP2y9Jw+Z0+mNL4F2uWQqnAPzj3seLyfpDA== dependencies: - "@volar/language-core" "1.7.6" - "@volar/source-map" "1.7.6" + "@volar/language-core" "1.7.8" + "@volar/source-map" "1.7.8" "@vue/compiler-dom" "^3.3.0" "@vue/reactivity" "^3.3.0" "@vue/shared" "^3.3.0" @@ -718,13 +718,13 @@ resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.4.0.tgz#f01e2f6089b5098136fb084a0dd0cdd4533b72b0" integrity sha512-CPuIReonid9+zOG/CGTT05FXrPYATEqoDGNrEaqS4hwcw5BUNM2FguC0mOwJD4Jr16UpRVl9N0pY3P+srIbqmg== -"@vue/typescript@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@vue/typescript/-/typescript-1.8.0.tgz#0483abb622df89044509187960ca334d8b44662b" - integrity sha512-swi0NM+dpZCldXkMGS8wCxvoiRgA0PJw0UQeSTA7PqB2/5LsOQ8pmxyqLPE6YsbEdn0XqI9a7QgKOmmElkaMOA== +"@vue/typescript@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@vue/typescript/-/typescript-1.8.1.tgz#2302f3cc8330e8dd91982eecd64d71ee11198cb0" + integrity sha512-nQpo55j/roie8heCfqyXHnyayqD5+p4/0fzfxH4ZuHf7NSBQS791PNv7ztp2CCOjnGAiaiCMdtC9rc6oriyPUg== dependencies: - "@volar/typescript" "1.7.6" - "@vue/language-core" "1.8.0" + "@volar/typescript" "1.7.8" + "@vue/language-core" "1.8.1" acorn-jsx@^5.2.0, acorn-jsx@^5.3.2: version "5.3.2" @@ -2184,10 +2184,10 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -sass@^1.63.4: - version "1.63.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.4.tgz#caf60643321044c61f6a0fe638a07abbd31cfb5d" - integrity sha512-Sx/+weUmK+oiIlI+9sdD0wZHsqpbgQg8wSwSnGBjwb5GwqFhYNwwnI+UWZtLjKvKyFlKkatRK235qQ3mokyPoQ== +sass@^1.63.5: + version "1.63.5" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.63.5.tgz#6e1900b12576e3e74a8ab0a9d8607cacbe584ef1" + integrity sha512-Q6c5gs482oezdAp+0fWF9cRisvpy7yfYb64knID0OE8AnMgtkluRPfpGMFjeD4/+M4+6QpJZCU6JRSxbjiktkg== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -2382,10 +2382,10 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -terser@^5.18.0: - version "5.18.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.0.tgz#dc811fb8e3481a875d545bda247c8730ee4dc76b" - integrity sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA== +terser@^5.18.1: + version "5.18.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.18.1.tgz#6d8642508ae9fb7b48768e48f16d675c89a78460" + integrity sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -2515,11 +2515,6 @@ vite@^4.3.9: optionalDependencies: fsevents "~2.3.2" -vscode-uri@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.7.tgz#6d19fef387ee6b46c479e5fb00870e15e58c1eb8" - integrity sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA== - vue-eslint-parser@^9.1.1: version "9.1.1" resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.1.1.tgz#3f4859be7e9bb7edaa1dc7edb05abffee72bf3dd" @@ -2571,15 +2566,14 @@ vue-template-compiler@^2.7.14: de-indent "^1.0.2" he "^1.2.0" -vue-tsc@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.0.tgz#0312964b67c8e2a3fe15ae5328f087f3cef93a5c" - integrity sha512-zRjRghohec71o+o3dzzqwFLtbKmJ1K1xRnq9ToHRdnHbBSZA2eUaTT1o+y4xOkBLZtW4cv7FkZE0FGCZfMrcBw== +vue-tsc@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/vue-tsc/-/vue-tsc-1.8.1.tgz#cdbc83ad7d1c80eac82e01917a58bc57e2debed2" + integrity sha512-GxBQrcb0Qvyrj1uZqnTXQyWbXdNDRY2MTa+r7ESgjhf+WzBSdxZfkS3KD/C3WhKYG+aN8hf44Hp5Gqzb6PehAA== dependencies: - "@vue/language-core" "1.8.0" - "@vue/typescript" "1.8.0" + "@vue/language-core" "1.8.1" + "@vue/typescript" "1.8.1" semver "^7.3.8" - vscode-uri "^3.0.7" vue@^3.3.4: version "3.3.4" From 582867cdb9fdff2c216f07cd5ff69afc9c98beea Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Wed, 21 Jun 2023 20:44:18 +0200 Subject: [PATCH 8/8] Update olikraus/U8g2 from 2.34.18 to 2.34.22 --- platformio.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformio.ini b/platformio.ini index cd46b6f9c..bdc0e9370 100644 --- a/platformio.ini +++ b/platformio.ini @@ -35,7 +35,7 @@ lib_deps = bblanchon/ArduinoJson @ ^6.21.2 https://github.com/bertmelis/espMqttClient.git#v1.4.3 nrf24/RF24 @ ^1.4.7 - olikraus/U8g2 @ ^2.34.18 + olikraus/U8g2 @ ^2.34.22 buelowp/sunset @ ^1.1.7 extra_scripts =