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

Merge pull request #711 from proddy/dev

Browse Source 
minor updates
This commit is contained in:
Proddy
2022-10-30 16:47:08 +01:00
committed by GitHub
parent 03564b3a82 f3adc13c6d
commit 5199edff1e
8 changed files with 125 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/pre_release.yml vendored
View File

@@ -14,9 +14,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v4
- uses: actions/setup-node@v2 - uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: '16'
@@ -24,14 +24,12 @@ jobs:
id: build_info id: build_info
run: | run: |
version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'` version=`grep -E '^#define EMSESP_APP_VERSION' ./src/version.h | awk -F'"' '{print $2}'`
echo "::set-output name=version::$version" echo "VERSION=$version" >> $GITHUB_OUTPUT
- name: Install PlatformIO - name: Install PlatformIO
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install -U platformio pip install -U platformio
platformio upgrade
pio pkg update
- name: Build WebUI - name: Build WebUI
run: | run: |
@@ -48,7 +46,7 @@ jobs:
uses: "marvinpinto/action-automatic-releases@latest" uses: "marvinpinto/action-automatic-releases@latest"
with: with:
repo_token: "${{ secrets.GITHUB_TOKEN }}" repo_token: "${{ secrets.GITHUB_TOKEN }}"
title: Development Build v${{steps.build_info.outputs.version}} title: Development Build v${{steps.build_info.outputs.VERSION}}
automatic_release_tag: "latest" automatic_release_tag: "latest"
prerelease: true prerelease: true
files: | files: |

212
interface/package-lock.json generated
View File

@@ -8,16 +8,16 @@
"name": "EMS-ESP", "name": "EMS-ESP",
"version": "3.5.0", "version": "3.5.0",
"dependencies": { "dependencies": {
"@emotion/react": "^11.10.4", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.4", "@emotion/styled": "^11.10.5",
"@msgpack/msgpack": "^2.8.0", "@msgpack/msgpack": "^2.8.0",
"@mui/icons-material": "^5.10.9", "@mui/icons-material": "^5.10.9",
"@mui/material": "^5.10.10", "@mui/material": "^5.10.11",
"@table-library/react-table-library": "4.0.23", "@table-library/react-table-library": "4.0.23",
"@types/lodash": "^4.14.186", "@types/lodash": "^4.14.186",
"@types/node": "^18.11.4", "@types/node": "^18.11.7",
"@types/react": "^18.0.22", "@types/react": "^18.0.24",
"@types/react-dom": "^18.0.7", "@types/react-dom": "^18.0.8",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"axios": "^1.1.3", "axios": "^1.1.3",
@@ -2108,37 +2108,37 @@
} }
}, },
"node_modules/@emotion/babel-plugin": { "node_modules/@emotion/babel-plugin": {
"version": "11.10.2", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz",
"integrity": "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==", "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==",
"dependencies": { "dependencies": {
"@babel/helper-module-imports": "^7.16.7", "@babel/helper-module-imports": "^7.16.7",
"@babel/plugin-syntax-jsx": "^7.17.12", "@babel/plugin-syntax-jsx": "^7.17.12",
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/hash": "^0.9.0", "@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"babel-plugin-macros": "^3.1.0", "babel-plugin-macros": "^3.1.0",
"convert-source-map": "^1.5.0", "convert-source-map": "^1.5.0",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"source-map": "^0.5.7", "source-map": "^0.5.7",
"stylis": "4.0.13" "stylis": "4.1.3"
}, },
"peerDependencies": { "peerDependencies": {
"@babel/core": "^7.0.0" "@babel/core": "^7.0.0"
} }
}, },
"node_modules/@emotion/cache": { "node_modules/@emotion/cache": {
"version": "11.10.3", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz",
"integrity": "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==", "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==",
"dependencies": { "dependencies": {
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
"@emotion/sheet": "^1.2.0", "@emotion/sheet": "^1.2.1",
"@emotion/utils": "^1.2.0", "@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0", "@emotion/weak-memoize": "^0.3.0",
"stylis": "4.0.13" "stylis": "4.1.3"
} }
}, },
"node_modules/@emotion/hash": { "node_modules/@emotion/hash": {
@@ -2160,14 +2160,14 @@
"integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
}, },
"node_modules/@emotion/react": { "node_modules/@emotion/react": {
"version": "11.10.4", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.4.tgz", "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz",
"integrity": "sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==", "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0", "@emotion/babel-plugin": "^11.10.5",
"@emotion/cache": "^11.10.0", "@emotion/cache": "^11.10.5",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0", "@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0", "@emotion/weak-memoize": "^0.3.0",
@@ -2187,9 +2187,9 @@
} }
}, },
"node_modules/@emotion/serialize": { "node_modules/@emotion/serialize": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
"integrity": "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==", "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
"dependencies": { "dependencies": {
"@emotion/hash": "^0.9.0", "@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
@@ -2199,19 +2199,19 @@
} }
}, },
"node_modules/@emotion/sheet": { "node_modules/@emotion/sheet": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz", "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
"integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==" "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
}, },
"node_modules/@emotion/styled": { "node_modules/@emotion/styled": {
"version": "11.10.4", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.4.tgz", "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz",
"integrity": "sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ==", "integrity": "sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0", "@emotion/babel-plugin": "^11.10.5",
"@emotion/is-prop-valid": "^1.2.0", "@emotion/is-prop-valid": "^1.2.0",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0" "@emotion/utils": "^1.2.0"
}, },
@@ -3094,9 +3094,9 @@
} }
}, },
"node_modules/@mui/base": { "node_modules/@mui/base": {
"version": "5.0.0-alpha.102", "version": "5.0.0-alpha.103",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.102.tgz", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.103.tgz",
"integrity": "sha512-5e/qAIP+DlkrZxIt/cwnDw/A3ii22WkoEoWKHyu4+oeGs3/1Flh7qLaN4h5EAIBB9TvTEZEUzvmsTInmIj6ghg==", "integrity": "sha512-fJIyB2df3CHn7D26WHnutnY7vew6aytTlhmRJz6GX7ag19zU2GcOUhJAzY5qwWcrXKnlYgzimhEjaEnuiUWU4g==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.19.0", "@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0", "@emotion/is-prop-valid": "^1.2.0",
@@ -3126,9 +3126,9 @@
} }
}, },
"node_modules/@mui/core-downloads-tracker": { "node_modules/@mui/core-downloads-tracker": {
"version": "5.10.10", "version": "5.10.11",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.10.tgz", "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.11.tgz",
"integrity": "sha512-aDuE2PNEh+hAndxEWlZgq7uiFPZKJtnkPDX7v6kSCrMXA32ZaQ6rZi5olmC7DUHt/BaOSxb7N/im/ss0XBkDhA==", "integrity": "sha512-u5ff+UCFDHcR8MoQ8tuJR4c35vt7T/ki3aMEE2O3XQoGs8KJSrBiisFpFKyldg9/W2NSyoZxN+kxEGIfRxh+9Q==",
"funding": { "funding": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/mui" "url": "https://opencollective.com/mui"
@@ -3160,13 +3160,13 @@
} }
}, },
"node_modules/@mui/material": { "node_modules/@mui/material": {
"version": "5.10.10", "version": "5.10.11",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.10.tgz", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.11.tgz",
"integrity": "sha512-ioLvqY7VvcePz9dnEIRhpiVvtJmAFmvG6rtLXXzVdMmAVbSaelr5Io07mPz/mCyqE+Uv8/4EuJV276DWO7etzA==", "integrity": "sha512-KJ0wPCTbv6sFzwA3dgg0gowdfF+SRl7D510J9l6Nl/KFX0EawcewQudqKY4slYGFXniKa5PykqokpaWXsCCPqg==",
"dependencies": { "dependencies": {
"@babel/runtime": "^7.19.0", "@babel/runtime": "^7.19.0",
"@mui/base": "5.0.0-alpha.102", "@mui/base": "5.0.0-alpha.103",
"@mui/core-downloads-tracker": "^5.10.10", "@mui/core-downloads-tracker": "^5.10.11",
"@mui/system": "^5.10.10", "@mui/system": "^5.10.10",
"@mui/types": "^7.2.0", "@mui/types": "^7.2.0",
"@mui/utils": "^5.10.9", "@mui/utils": "^5.10.9",
@@ -4020,9 +4020,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==" "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "18.11.4", "version": "18.11.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.4.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
"integrity": "sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==" "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="
}, },
"node_modules/@types/parse-json": { "node_modules/@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
@@ -4055,9 +4055,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
}, },
"node_modules/@types/react": { "node_modules/@types/react": {
"version": "18.0.22", "version": "18.0.24",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.22.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.24.tgz",
"integrity": "sha512-4yWc5PyCkZN8ke8K9rQHkTXxHIWHxLzzW6RI1kXVoepkD3vULpKzC2sDtAMKn78h92BRYuzf+7b/ms7ajE6hFw==", "integrity": "sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q==",
"dependencies": { "dependencies": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@@ -4065,9 +4065,9 @@
} }
}, },
"node_modules/@types/react-dom": { "node_modules/@types/react-dom": {
"version": "18.0.7", "version": "18.0.8",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.8.tgz",
"integrity": "sha512-HaXc+BbqAZE1RdsK3tC8SbkFy6UL2xF76lT9rQs5JkPrJg3rWA3Ou/Lhw3YJQzEDkBpmJ79nBsfnd05WrBd2QQ==", "integrity": "sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw==",
"dependencies": { "dependencies": {
"@types/react": "*" "@types/react": "*"
} }
@@ -15885,9 +15885,9 @@
} }
}, },
"node_modules/stylis": { "node_modules/stylis": {
"version": "4.0.13", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
"integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
}, },
"node_modules/supports-color": { "node_modules/supports-color": {
"version": "5.5.0", "version": "5.5.0",
@@ -18899,34 +18899,34 @@
"requires": {} "requires": {}
}, },
"@emotion/babel-plugin": { "@emotion/babel-plugin": {
"version": "11.10.2", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.2.tgz", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz",
"integrity": "sha512-xNQ57njWTFVfPAc3cjfuaPdsgLp5QOSuRsj9MA6ndEhH/AzuZM86qIQzt6rq+aGBwj3n5/TkLmU5lhAfdRmogA==", "integrity": "sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA==",
"requires": { "requires": {
"@babel/helper-module-imports": "^7.16.7", "@babel/helper-module-imports": "^7.16.7",
"@babel/plugin-syntax-jsx": "^7.17.12", "@babel/plugin-syntax-jsx": "^7.17.12",
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/hash": "^0.9.0", "@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"babel-plugin-macros": "^3.1.0", "babel-plugin-macros": "^3.1.0",
"convert-source-map": "^1.5.0", "convert-source-map": "^1.5.0",
"escape-string-regexp": "^4.0.0", "escape-string-regexp": "^4.0.0",
"find-root": "^1.1.0", "find-root": "^1.1.0",
"source-map": "^0.5.7", "source-map": "^0.5.7",
"stylis": "4.0.13" "stylis": "4.1.3"
} }
}, },
"@emotion/cache": { "@emotion/cache": {
"version": "11.10.3", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.3.tgz", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.10.5.tgz",
"integrity": "sha512-Psmp/7ovAa8appWh3g51goxu/z3iVms7JXOreq136D8Bbn6dYraPnmL6mdM8GThEx9vwSn92Fz+mGSjBzN8UPQ==", "integrity": "sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA==",
"requires": { "requires": {
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
"@emotion/sheet": "^1.2.0", "@emotion/sheet": "^1.2.1",
"@emotion/utils": "^1.2.0", "@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0", "@emotion/weak-memoize": "^0.3.0",
"stylis": "4.0.13" "stylis": "4.1.3"
} }
}, },
"@emotion/hash": { "@emotion/hash": {
@@ -18948,14 +18948,14 @@
"integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA==" "integrity": "sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA=="
}, },
"@emotion/react": { "@emotion/react": {
"version": "11.10.4", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.4.tgz", "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.10.5.tgz",
"integrity": "sha512-j0AkMpr6BL8gldJZ6XQsQ8DnS9TxEQu1R+OGmDZiWjBAJtCcbt0tS3I/YffoqHXxH6MjgI7KdMbYKw3MEiU9eA==", "integrity": "sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A==",
"requires": { "requires": {
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0", "@emotion/babel-plugin": "^11.10.5",
"@emotion/cache": "^11.10.0", "@emotion/cache": "^11.10.5",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0", "@emotion/utils": "^1.2.0",
"@emotion/weak-memoize": "^0.3.0", "@emotion/weak-memoize": "^0.3.0",
@@ -18963,9 +18963,9 @@
} }
}, },
"@emotion/serialize": { "@emotion/serialize": {
"version": "1.1.0", "version": "1.1.1",
"resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.1.1.tgz",
"integrity": "sha512-F1ZZZW51T/fx+wKbVlwsfchr5q97iW8brAnXmsskz4d0hVB4O3M/SiA3SaeH06x02lSNzkkQv+n3AX3kCXKSFA==", "integrity": "sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA==",
"requires": { "requires": {
"@emotion/hash": "^0.9.0", "@emotion/hash": "^0.9.0",
"@emotion/memoize": "^0.8.0", "@emotion/memoize": "^0.8.0",
@@ -18975,19 +18975,19 @@
} }
}, },
"@emotion/sheet": { "@emotion/sheet": {
"version": "1.2.0", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.0.tgz", "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.2.1.tgz",
"integrity": "sha512-OiTkRgpxescko+M51tZsMq7Puu/KP55wMT8BgpcXVG2hqXc0Vo0mfymJ/Uj24Hp0i083ji/o0aLddh08UEjq8w==" "integrity": "sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA=="
}, },
"@emotion/styled": { "@emotion/styled": {
"version": "11.10.4", "version": "11.10.5",
"resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.4.tgz", "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.10.5.tgz",
"integrity": "sha512-pRl4R8Ez3UXvOPfc2bzIoV8u9P97UedgHS4FPX594ntwEuAMA114wlaHvOK24HB48uqfXiGlYIZYCxVJ1R1ttQ==", "integrity": "sha512-8EP6dD7dMkdku2foLoruPCNkRevzdcBaY6q0l0OsbyJK+x8D9HWjX27ARiSIKNF634hY9Zdoedh8bJCiva8yZw==",
"requires": { "requires": {
"@babel/runtime": "^7.18.3", "@babel/runtime": "^7.18.3",
"@emotion/babel-plugin": "^11.10.0", "@emotion/babel-plugin": "^11.10.5",
"@emotion/is-prop-valid": "^1.2.0", "@emotion/is-prop-valid": "^1.2.0",
"@emotion/serialize": "^1.1.0", "@emotion/serialize": "^1.1.1",
"@emotion/use-insertion-effect-with-fallbacks": "^1.0.0", "@emotion/use-insertion-effect-with-fallbacks": "^1.0.0",
"@emotion/utils": "^1.2.0" "@emotion/utils": "^1.2.0"
} }
@@ -19634,9 +19634,9 @@
"integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==" "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="
}, },
"@mui/base": { "@mui/base": {
"version": "5.0.0-alpha.102", "version": "5.0.0-alpha.103",
"resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.102.tgz", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-alpha.103.tgz",
"integrity": "sha512-5e/qAIP+DlkrZxIt/cwnDw/A3ii22WkoEoWKHyu4+oeGs3/1Flh7qLaN4h5EAIBB9TvTEZEUzvmsTInmIj6ghg==", "integrity": "sha512-fJIyB2df3CHn7D26WHnutnY7vew6aytTlhmRJz6GX7ag19zU2GcOUhJAzY5qwWcrXKnlYgzimhEjaEnuiUWU4g==",
"requires": { "requires": {
"@babel/runtime": "^7.19.0", "@babel/runtime": "^7.19.0",
"@emotion/is-prop-valid": "^1.2.0", "@emotion/is-prop-valid": "^1.2.0",
@@ -19649,9 +19649,9 @@
} }
}, },
"@mui/core-downloads-tracker": { "@mui/core-downloads-tracker": {
"version": "5.10.10", "version": "5.10.11",
"resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.10.tgz", "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.10.11.tgz",
"integrity": "sha512-aDuE2PNEh+hAndxEWlZgq7uiFPZKJtnkPDX7v6kSCrMXA32ZaQ6rZi5olmC7DUHt/BaOSxb7N/im/ss0XBkDhA==" "integrity": "sha512-u5ff+UCFDHcR8MoQ8tuJR4c35vt7T/ki3aMEE2O3XQoGs8KJSrBiisFpFKyldg9/W2NSyoZxN+kxEGIfRxh+9Q=="
}, },
"@mui/icons-material": { "@mui/icons-material": {
"version": "5.10.9", "version": "5.10.9",
@@ -19662,13 +19662,13 @@
} }
}, },
"@mui/material": { "@mui/material": {
"version": "5.10.10", "version": "5.10.11",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.10.tgz", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.10.11.tgz",
"integrity": "sha512-ioLvqY7VvcePz9dnEIRhpiVvtJmAFmvG6rtLXXzVdMmAVbSaelr5Io07mPz/mCyqE+Uv8/4EuJV276DWO7etzA==", "integrity": "sha512-KJ0wPCTbv6sFzwA3dgg0gowdfF+SRl7D510J9l6Nl/KFX0EawcewQudqKY4slYGFXniKa5PykqokpaWXsCCPqg==",
"requires": { "requires": {
"@babel/runtime": "^7.19.0", "@babel/runtime": "^7.19.0",
"@mui/base": "5.0.0-alpha.102", "@mui/base": "5.0.0-alpha.103",
"@mui/core-downloads-tracker": "^5.10.10", "@mui/core-downloads-tracker": "^5.10.11",
"@mui/system": "^5.10.10", "@mui/system": "^5.10.10",
"@mui/types": "^7.2.0", "@mui/types": "^7.2.0",
"@mui/utils": "^5.10.9", "@mui/utils": "^5.10.9",
@@ -20224,9 +20224,9 @@
"integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==" "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA=="
}, },
"@types/node": { "@types/node": {
"version": "18.11.4", "version": "18.11.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.4.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
"integrity": "sha512-BxcJpBu8D3kv/GZkx/gSMz6VnTJREBj/4lbzYOQueUOELkt8WrO6zAcSPmp9uRPEW/d+lUO8QK0W2xnS1hEU0A==" "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ=="
}, },
"@types/parse-json": { "@types/parse-json": {
"version": "4.0.0", "version": "4.0.0",
@@ -20259,9 +20259,9 @@
"integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw=="
}, },
"@types/react": { "@types/react": {
"version": "18.0.22", "version": "18.0.24",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.22.tgz", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.24.tgz",
"integrity": "sha512-4yWc5PyCkZN8ke8K9rQHkTXxHIWHxLzzW6RI1kXVoepkD3vULpKzC2sDtAMKn78h92BRYuzf+7b/ms7ajE6hFw==", "integrity": "sha512-wRJWT6ouziGUy+9uX0aW4YOJxAY0bG6/AOk5AW5QSvZqI7dk6VBIbXvcVgIw/W5Jrl24f77df98GEKTJGOLx7Q==",
"requires": { "requires": {
"@types/prop-types": "*", "@types/prop-types": "*",
"@types/scheduler": "*", "@types/scheduler": "*",
@@ -20269,9 +20269,9 @@
} }
}, },
"@types/react-dom": { "@types/react-dom": {
"version": "18.0.7", "version": "18.0.8",
"resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.7.tgz", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.8.tgz",
"integrity": "sha512-HaXc+BbqAZE1RdsK3tC8SbkFy6UL2xF76lT9rQs5JkPrJg3rWA3Ou/Lhw3YJQzEDkBpmJ79nBsfnd05WrBd2QQ==", "integrity": "sha512-C3GYO0HLaOkk9dDAz3Dl4sbe4AKUGTCfFIZsz3n/82dPNN8Du533HzKatDxeUYWu24wJgMP1xICqkWk1YOLOIw==",
"requires": { "requires": {
"@types/react": "*" "@types/react": "*"
} }
@@ -28689,9 +28689,9 @@
} }
}, },
"stylis": { "stylis": {
"version": "4.0.13", "version": "4.1.3",
"resolved": "https://registry.npmjs.org/stylis/-/stylis-4.0.13.tgz", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.1.3.tgz",
"integrity": "sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag==" "integrity": "sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA=="
}, },
"supports-color": { "supports-color": {
"version": "5.5.0", "version": "5.5.0",

12
interface/package.json
View File

@@ -4,16 +4,16 @@
"private": true, "private": true,
"proxy": "http://localhost:3080", "proxy": "http://localhost:3080",
"dependencies": { "dependencies": {
"@emotion/react": "^11.10.4", "@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.4", "@emotion/styled": "^11.10.5",
"@msgpack/msgpack": "^2.8.0", "@msgpack/msgpack": "^2.8.0",
"@mui/icons-material": "^5.10.9", "@mui/icons-material": "^5.10.9",
"@mui/material": "^5.10.10", "@mui/material": "^5.10.11",
"@table-library/react-table-library": "4.0.23", "@table-library/react-table-library": "4.0.23",
"@types/lodash": "^4.14.186", "@types/lodash": "^4.14.186",
"@types/node": "^18.11.4", "@types/node": "^18.11.7",
"@types/react": "^18.0.22", "@types/react": "^18.0.24",
"@types/react-dom": "^18.0.7", "@types/react-dom": "^18.0.8",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"axios": "^1.1.3", "axios": "^1.1.3",

1
lib/Adafruit_NeoPixel-master/Adafruit_NeoPixel.cpp
View File

@@ -2156,7 +2156,6 @@ void Adafruit_NeoPixel::show(void) {
// We need to disable the device and disconnect // We need to disable the device and disconnect
// all the outputs before leave or the device will not // all the outputs before leave or the device will not
// be selected on the next call. // be selected on the next call.
// TODO: Check if disabling the device causes performance issues.
pwm->ENABLE = 0; pwm->ENABLE = 0;
pwm->PSEL.OUT[0] = 0xFFFFFFFFUL; pwm->PSEL.OUT[0] = 0xFFFFFFFFUL;

1
lib/uuid-console/src/commands.cpp
View File

@@ -186,7 +186,6 @@ bool Commands::find_longest_common_prefix(const std::multimap<size_t, const Comm
} }
if (chars_prefix > 0) { if (chars_prefix > 0) {
// TODO fix, no more PGM
longest_name.push_back(std::string(first).substr(0, chars_prefix)); longest_name.push_back(std::string(first).substr(0, chars_prefix));
return false; return false;
} }

2
sonar-project.properties
View File

@@ -6,6 +6,6 @@ sonar.sources=./src
sonar.cfamily.build-wrapper-output=build_wrapper_output_directory sonar.cfamily.build-wrapper-output=build_wrapper_output_directory
sonar.sourceEncoding=UTF-8 sonar.sourceEncoding=UTF-8
sonar.host.url=https://sonarcloud.io sonar.host.url=https://sonarcloud.io
sonar.cfamily.threads=8 sonar.cfamily.threads=2
sonar.cfamily.cache.enabled=false sonar.cfamily.cache.enabled=false
; sonar.cfamily.cache.path=./sonar/cache ; sonar.cfamily.cache.path=./sonar/cache

7
src/devices/boiler.cpp
View File

@@ -578,7 +578,12 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
FL_(wwSelTempSingle), FL_(wwSelTempSingle),
DeviceValueUOM::DEGREES, DeviceValueUOM::DEGREES,
MAKE_CF_CB(set_ww_temp_single)); MAKE_CF_CB(set_ww_temp_single));
register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwSolarTemp_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(wwSolarTemp), DeviceValueUOM::DEGREES); register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW,
&wwSolarTemp_,
DeviceValueType::USHORT,
DeviceValueNumOp::DV_NUMOP_DIV10,
FL_(wwSolarTemp),
DeviceValueUOM::DEGREES);
register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwType_, DeviceValueType::ENUM, FL_(enum_flow), FL_(wwType), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwType_, DeviceValueType::ENUM, FL_(enum_flow), FL_(wwType), DeviceValueUOM::NONE);
register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW,
&wwComfort_, &wwComfort_,

2
src/system.cpp
View File

@@ -742,7 +742,7 @@ void System::led_monitor() {
pixels.setPixelColor(0, 0, 0, 0); pixels.setPixelColor(0, 0, 0, 0);
pixels.show(); pixels.show();
#else #else
digitalWrite(led_gpio_, !LED_ON); // LED off digitalWrite(led_gpio_, !LED_ON); // LED off
#endif #endif
} else if (led_flash_step_ % 2) { } else if (led_flash_step_ % 2) {
// handle the step events (on odd numbers 3,5,7,etc). see if we need to turn on a LED // handle the step events (on odd numbers 3,5,7,etc). see if we need to turn on a LED