andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
MichaelDvP
2023-08-08 16:28:13 +02:00
parent 461f1bb102 9226e5b303
commit 1360a5d35b
3 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,6 +1,6 @@
# vscode # vscode
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
# .vscode/extensions.json .vscode/extensions.json
.vscode/launch.json .vscode/launch.json
# .vscode/settings.json # .vscode/settings.json

4
interface/package.json
View File

@@ -23,10 +23,10 @@
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.3", "@mui/icons-material": "^5.14.3",
"@mui/material": "^5.14.3", "@mui/material": "^5.14.4",
"@preact/compat": "^17.1.2", "@preact/compat": "^17.1.2",
"@prefresh/vite": "^2.4.1", "@prefresh/vite": "^2.4.1",
"@table-library/react-table-library": "4.1.4", "@table-library/react-table-library": "4.1.6",
"@types/lodash-es": "^4.17.8", "@types/lodash-es": "^4.17.8",
"@types/node": "^20.4.8", "@types/node": "^20.4.8",
"@types/react": "^18.2.19", "@types/react": "^18.2.19",

80
interface/yarn.lock
View File

@@ -357,7 +357,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7": "@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7":
version: 7.22.6 version: 7.22.6
resolution: "@babel/runtime@npm:7.22.6" resolution: "@babel/runtime@npm:7.22.6"
dependencies: dependencies:
@@ -875,14 +875,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/base@npm:5.0.0-beta.9": "@mui/base@npm:5.0.0-beta.10":
version: 5.0.0-beta.9 version: 5.0.0-beta.10
resolution: "@mui/base@npm:5.0.0-beta.9" resolution: "@mui/base@npm:5.0.0-beta.10"
dependencies: dependencies:
"@babel/runtime": ^7.22.6 "@babel/runtime": ^7.22.6
"@emotion/is-prop-valid": ^1.2.1 "@emotion/is-prop-valid": ^1.2.1
"@mui/types": ^7.2.4 "@mui/types": ^7.2.4
"@mui/utils": ^5.14.3 "@mui/utils": ^5.14.4
"@popperjs/core": ^2.11.8 "@popperjs/core": ^2.11.8
clsx: ^2.0.0 clsx: ^2.0.0
prop-types: ^15.8.1 prop-types: ^15.8.1
@@ -894,14 +894,14 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: adf4e08b0798266ecf80c50b8898913c46cae829958b938c69a662bd88146a112d15277e257043ab540e95d397710388b7e59d2043f45faef9e6a993415d46a5 checksum: c7563a107334ef47eff5aa2595b0200f3b4061a0757aa0fb43e5c56e2fba594b20a3a535ea9847fa6e7138f4fcff7e67893193fb647730a2a6b0cb9ea1016c9a
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.14.3": "@mui/core-downloads-tracker@npm:^5.14.4":
version: 5.14.3 version: 5.14.4
resolution: "@mui/core-downloads-tracker@npm:5.14.3" resolution: "@mui/core-downloads-tracker@npm:5.14.4"
checksum: aa26434efc2e36aeb58f5f56d879a02eb064765bb3c82abe6e9e72330b6778852852e11ecc6166aecf168b1f6f07d81d4ecf84f8b3f2978587485013d5e82c54 checksum: 23d652570020fcba2956dcc53da94da0242a900a3fa5ca4af1bfcb74f4ea6bc6f6725e1908dde232caf3a3a55fc0ab34fcb05832e3a41fbd8070b3d13a6aa6cc
languageName: node languageName: node
linkType: hard linkType: hard
@@ -921,16 +921,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.14.3": "@mui/material@npm:^5.14.4":
version: 5.14.3 version: 5.14.4
resolution: "@mui/material@npm:5.14.3" resolution: "@mui/material@npm:5.14.4"
dependencies: dependencies:
"@babel/runtime": ^7.22.6 "@babel/runtime": ^7.22.6
"@mui/base": 5.0.0-beta.9 "@mui/base": 5.0.0-beta.10
"@mui/core-downloads-tracker": ^5.14.3 "@mui/core-downloads-tracker": ^5.14.4
"@mui/system": ^5.14.3 "@mui/system": ^5.14.4
"@mui/types": ^7.2.4 "@mui/types": ^7.2.4
"@mui/utils": ^5.14.3 "@mui/utils": ^5.14.4
"@types/react-transition-group": ^4.4.6 "@types/react-transition-group": ^4.4.6
clsx: ^2.0.0 clsx: ^2.0.0
csstype: ^3.1.2 csstype: ^3.1.2
@@ -950,16 +950,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 29c3122b57423467b8ece41dacffb0bf8bdec5cd498d61ab6c0d320cd2a6d567e78ce3658a2987c2d5ab474b4396104af99308193d51a53c51d0e2ac3e99bb8b checksum: 653b87fbd92de29a0e37579651333bea078518a81cbbab6f37b807aee10af438a050660b887da81ee5df8d14f688b169573f4f709f0e6c28d4a19c9de2eed502
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^5.13.7": "@mui/private-theming@npm:^5.14.4":
version: 5.13.7 version: 5.14.4
resolution: "@mui/private-theming@npm:5.13.7" resolution: "@mui/private-theming@npm:5.14.4"
dependencies: dependencies:
"@babel/runtime": ^7.22.5 "@babel/runtime": ^7.22.6
"@mui/utils": ^5.13.7 "@mui/utils": ^5.14.4
prop-types: ^15.8.1 prop-types: ^15.8.1
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
@@ -967,7 +967,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: e38b0a441f55651767a8b29d767c9457d368ab0870f76d38d001fd127663796a219f8c50be79a71343faa798e1ae78b4b379d3c1e391fb0910b27fedf5ce3f70 checksum: 647c19aab6420c4cd5529220c30afa77278badb8cff0251f84bc0d41b566f9c3f3771a59f1100d87a90f420a057679bc9e696da0fcd56272bf3fb4c13769fb8b
languageName: node languageName: node
linkType: hard linkType: hard
@@ -992,15 +992,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^5.14.3": "@mui/system@npm:^5.14.4":
version: 5.14.3 version: 5.14.4
resolution: "@mui/system@npm:5.14.3" resolution: "@mui/system@npm:5.14.4"
dependencies: dependencies:
"@babel/runtime": ^7.22.6 "@babel/runtime": ^7.22.6
"@mui/private-theming": ^5.13.7 "@mui/private-theming": ^5.14.4
"@mui/styled-engine": ^5.13.2 "@mui/styled-engine": ^5.13.2
"@mui/types": ^7.2.4 "@mui/types": ^7.2.4
"@mui/utils": ^5.14.3 "@mui/utils": ^5.14.4
clsx: ^2.0.0 clsx: ^2.0.0
csstype: ^3.1.2 csstype: ^3.1.2
prop-types: ^15.8.1 prop-types: ^15.8.1
@@ -1016,7 +1016,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 8fef8203a024ea24b581096cc9a72ef0d6df3bf492949faf603dee242a3d36c74903d5683cda786af228a7ad5c169b40e83f101030dab149e7857cf77c59fed1 checksum: d8d74d5c05cd73cf859649ca2abbbaccc37bf6b87a122c09f080349f3e22e3d1c4cacc1f6d23a808b19078eba9a68a6ac2781e0783f6ca18d66964306c766f78
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1032,9 +1032,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^5.13.7, @mui/utils@npm:^5.14.3": "@mui/utils@npm:^5.14.4":
version: 5.14.3 version: 5.14.4
resolution: "@mui/utils@npm:5.14.3" resolution: "@mui/utils@npm:5.14.4"
dependencies: dependencies:
"@babel/runtime": ^7.22.6 "@babel/runtime": ^7.22.6
"@types/prop-types": ^15.7.5 "@types/prop-types": ^15.7.5
@@ -1043,7 +1043,7 @@ __metadata:
react-is: ^18.2.0 react-is: ^18.2.0
peerDependencies: peerDependencies:
react: ^17.0.0 || ^18.0.0 react: ^17.0.0 || ^18.0.0
checksum: 0f713f45639865df7babcd34bd69f5dc7214f27f31a519671f67c98d4b5c971e1e3e5321cca5ffa533f500eb8ebb88b806534202c2800d9395b43cabfb24d42a checksum: ad0d6ac443cc99c74949bd0cac86034ea2c847419e014e2e49f9bf1d1c648d05649d682145fc7ff632b064bbf9f582a28e313091388ed6e640266c2a0ecf8533
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1335,9 +1335,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@table-library/react-table-library@npm:4.1.4": "@table-library/react-table-library@npm:4.1.6":
version: 4.1.4 version: 4.1.6
resolution: "@table-library/react-table-library@npm:4.1.4" resolution: "@table-library/react-table-library@npm:4.1.6"
dependencies: dependencies:
clsx: 1.1.1 clsx: 1.1.1
react-virtualized-auto-sizer: 1.0.7 react-virtualized-auto-sizer: 1.0.7
@@ -1346,7 +1346,7 @@ __metadata:
"@emotion/react": ">= 11" "@emotion/react": ">= 11"
react: ">=16.8.0" react: ">=16.8.0"
react-dom: ">=16.8.0" react-dom: ">=16.8.0"
checksum: ace2711b777e596ed5fd1623108ac8fb7403566b108725f97e6710019a11f28f1f86b916932a662ad53ad18c994ba626f0b2fd7e6be91c44dff16d54e0364f0d checksum: 148b33000353068d2f40ce4e18d5c3314e4d66840822f83abbdc5c3cd9c82c297f28eea3df0ea2231308c56cc5fe34c5d4ab69be38a066cd4fd18e25214a76c0
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1679,11 +1679,11 @@ __metadata:
"@emotion/react": ^11.11.1 "@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0 "@emotion/styled": ^11.11.0
"@mui/icons-material": ^5.14.3 "@mui/icons-material": ^5.14.3
"@mui/material": ^5.14.3 "@mui/material": ^5.14.4
"@preact/compat": ^17.1.2 "@preact/compat": ^17.1.2
"@preact/preset-vite": ^2.5.0 "@preact/preset-vite": ^2.5.0
"@prefresh/vite": ^2.4.1 "@prefresh/vite": ^2.4.1
"@table-library/react-table-library": 4.1.4 "@table-library/react-table-library": 4.1.6
"@types/babel__core": ^7 "@types/babel__core": ^7
"@types/lodash-es": ^4.17.8 "@types/lodash-es": ^4.17.8
"@types/node": ^20.4.8 "@types/node": ^20.4.8