andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1529 from proddy/dev

Browse Source 
fix HA modes from dev2 for #1525
This commit is contained in:
Proddy
2023-12-28 13:41:38 +01:00
committed by GitHub
parent 8d33a89e39 8bffa6b304
commit 339408e12a
6 changed files with 162 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
interface/package.json
View File

@@ -22,10 +22,10 @@
"dependencies": { "dependencies": {
"@alova/adapter-xhr": "^1.0.2", "@alova/adapter-xhr": "^1.0.2",
"@babel/core": "^7.23.6", "@babel/core": "^7.23.6",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.3",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.1", "@mui/icons-material": "^5.15.2",
"@mui/material": "^5.15.1", "@mui/material": "^5.15.2",
"@table-library/react-table-library": "4.1.7", "@table-library/react-table-library": "4.1.7",
"@types/imagemin": "^8.0.5", "@types/imagemin": "^8.0.5",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
@@ -33,7 +33,7 @@
"@types/react": "^18.2.45", "@types/react": "^18.2.45",
"@types/react-dom": "^18.2.18", "@types/react-dom": "^18.2.18",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
"alova": "^2.16.1", "alova": "^2.16.2",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"history": "^5.3.0", "history": "^5.3.0",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
@@ -52,8 +52,8 @@
"devDependencies": { "devDependencies": {
"@preact/compat": "^17.1.2", "@preact/compat": "^17.1.2",
"@preact/preset-vite": "^2.7.0", "@preact/preset-vite": "^2.7.0",
"@typescript-eslint/eslint-plugin": "^6.15.0", "@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.15.0", "@typescript-eslint/parser": "^6.16.0",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"eslint": "^8.56.0", "eslint": "^8.56.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
@@ -68,7 +68,7 @@
"eslint-plugin-react-hooks": "^4.6.0", "eslint-plugin-react-hooks": "^4.6.0",
"preact": "^10.19.3", "preact": "^10.19.3",
"prettier": "^3.1.1", "prettier": "^3.1.1",
"rollup-plugin-visualizer": "^5.11.0", "rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.26.0", "terser": "^5.26.0",
"vite": "^5.0.10", "vite": "^5.0.10",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",

270
interface/yarn.lock
View File

@@ -401,7 +401,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@babel/runtime@npm:^7.23.5": "@babel/runtime@npm:^7.23.6":
version: 7.23.6 version: 7.23.6
resolution: "@babel/runtime@npm:7.23.6" resolution: "@babel/runtime@npm:7.23.6"
dependencies: dependencies:
@@ -534,14 +534,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@emotion/react@npm:^11.11.1": "@emotion/react@npm:^11.11.3":
version: 11.11.1 version: 11.11.3
resolution: "@emotion/react@npm:11.11.1" resolution: "@emotion/react@npm:11.11.3"
dependencies: dependencies:
"@babel/runtime": "npm:^7.18.3" "@babel/runtime": "npm:^7.18.3"
"@emotion/babel-plugin": "npm:^11.11.0" "@emotion/babel-plugin": "npm:^11.11.0"
"@emotion/cache": "npm:^11.11.0" "@emotion/cache": "npm:^11.11.0"
"@emotion/serialize": "npm:^1.1.2" "@emotion/serialize": "npm:^1.1.3"
"@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1"
"@emotion/utils": "npm:^1.2.1" "@emotion/utils": "npm:^1.2.1"
"@emotion/weak-memoize": "npm:^0.3.1" "@emotion/weak-memoize": "npm:^0.3.1"
@@ -551,7 +551,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: dfc140718d0a8051a74e51c379226d9de6b19f6a5dd595fb282ef72f4413695a2d012ba919f1e9eeff761c6659e6f7398da8e0e36eb7997a4fdf54cef88644ae checksum: f7b98557b7d5236296dda48c2fc8a6cde4af7399758496e9f710f85a80c7d66fee1830966caabd7b237601bfdaca4e1add8c681d1ae4cc3d497fe88958d541c4
languageName: node languageName: node
linkType: hard linkType: hard
@@ -568,6 +568,19 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@emotion/serialize@npm:^1.1.3":
version: 1.1.3
resolution: "@emotion/serialize@npm:1.1.3"
dependencies:
"@emotion/hash": "npm:^0.9.1"
"@emotion/memoize": "npm:^0.8.1"
"@emotion/unitless": "npm:^0.8.1"
"@emotion/utils": "npm:^1.2.1"
csstype: "npm:^3.0.2"
checksum: 48d88923663273ae70359bc1a1f30454136716cbe0ddd9664be08e257ce56acedab911f125b627627358e37c9f450bbac3ea09b534ef42f9f67325d47b1e2a7b
languageName: node
linkType: hard
"@emotion/sheet@npm:^1.2.2": "@emotion/sheet@npm:^1.2.2":
version: 1.2.2 version: 1.2.2
resolution: "@emotion/sheet@npm:1.2.2" resolution: "@emotion/sheet@npm:1.2.2"
@@ -957,14 +970,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/base@npm:5.0.0-beta.28": "@mui/base@npm:5.0.0-beta.29":
version: 5.0.0-beta.28 version: 5.0.0-beta.29
resolution: "@mui/base@npm:5.0.0-beta.28" resolution: "@mui/base@npm:5.0.0-beta.29"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@floating-ui/react-dom": "npm:^2.0.4" "@floating-ui/react-dom": "npm:^2.0.4"
"@mui/types": "npm:^7.2.11" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.15.1" "@mui/utils": "npm:^5.15.2"
"@popperjs/core": "npm:^2.11.8" "@popperjs/core": "npm:^2.11.8"
clsx: "npm:^2.0.0" clsx: "npm:^2.0.0"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -975,22 +988,22 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: fb37f4301035bfcd5b6a7280521e3fcccd46ee34f096318c93516c03f3ed9e0bcb0dfbdeeca7611d0ccc42eadef483b7fd9c253cb3a19bbe86d3575144af84ac checksum: a651464968af6ebb775c24d2b9badc735b1d595e526ff7f8181186e6eed0735b14af8324db22a8744039ad79ce6dbb7c62920bb92a57959a66cf8e72d68af9aa
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.15.1": "@mui/core-downloads-tracker@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/core-downloads-tracker@npm:5.15.1" resolution: "@mui/core-downloads-tracker@npm:5.15.2"
checksum: a2035c49a8a76298fe9acbf4a79cd50eba3fc82e25d5568e11ad7146bac4b4fdebe72a2d63eb33583ca3345fc3e91d805329a6837b924080317246d84684f726 checksum: 8c88ac73a1d87c8ce565f6295dcd084c643580848e8f59159402e9db89975263da06305a0e605d3744479e917c2d297319496534bca9df8338e203162f1e7c33
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^5.15.1": "@mui/icons-material@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/icons-material@npm:5.15.1" resolution: "@mui/icons-material@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
peerDependencies: peerDependencies:
"@mui/material": ^5.0.0 "@mui/material": ^5.0.0
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
@@ -998,20 +1011,20 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: b9d15ec65b6b948dcfc79f6aa19cc21ebde5c424f629378c3c2a37cdd2649404ee539cad43bada0618309bb2e9d9f4d734b5a2742900b6775c36f17cf15dcc5e checksum: 6dad9fa436889ab89217d428f38b1f7868eb5db0b8aa2b16086f6e81666763767a29db8897e76d078919df7349a149c6e16da1aea1b3ae48ca0b7ee1e0d9d458
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.15.1": "@mui/material@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/material@npm:5.15.1" resolution: "@mui/material@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@mui/base": "npm:5.0.0-beta.28" "@mui/base": "npm:5.0.0-beta.29"
"@mui/core-downloads-tracker": "npm:^5.15.1" "@mui/core-downloads-tracker": "npm:^5.15.2"
"@mui/system": "npm:^5.15.1" "@mui/system": "npm:^5.15.2"
"@mui/types": "npm:^7.2.11" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.15.1" "@mui/utils": "npm:^5.15.2"
"@types/react-transition-group": "npm:^4.4.10" "@types/react-transition-group": "npm:^4.4.10"
clsx: "npm:^2.0.0" clsx: "npm:^2.0.0"
csstype: "npm:^3.1.2" csstype: "npm:^3.1.2"
@@ -1031,16 +1044,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: e40b61e03eb65b8390f88a0f37adcbeebad4d7b6b41e1995334a2946b0fab003818c3b7a1c2f46bed56c3d1fa360fe261d0ec1cab1fcfe322bcb8a26a94929c1 checksum: 1ce902070022c40009e01208e95d0d61205ffdbcf4fadd16e6337acdfccfb1c66004525ffe277691c7f3fbdfcebb998f1544c054a31164d580cb040e8a7d2d80
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^5.15.1": "@mui/private-theming@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/private-theming@npm:5.15.1" resolution: "@mui/private-theming@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@mui/utils": "npm:^5.15.1" "@mui/utils": "npm:^5.15.2"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
@@ -1048,15 +1061,15 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 4730b3a62ff5e955896ba731579c571c4948716525c3f6b44eb2590f78b7c016538a50390b473b5c2e648d82ff03c6771cc0bc9ff93edfb8bb311e9751b822e4 checksum: 2b1665044fd77286068100bd5c67ba3a31320084b442788e1c0224359b6e8e3213505676fa1db451c970b2e432811b12cbcf2f882c9063d37497dbfcfcd8811e
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/styled-engine@npm:^5.15.1": "@mui/styled-engine@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/styled-engine@npm:5.15.1" resolution: "@mui/styled-engine@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@emotion/cache": "npm:^11.11.0" "@emotion/cache": "npm:^11.11.0"
csstype: "npm:^3.1.2" csstype: "npm:^3.1.2"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -1069,19 +1082,19 @@ __metadata:
optional: true optional: true
"@emotion/styled": "@emotion/styled":
optional: true optional: true
checksum: 0e03bb6ccc54587b1fa9cacf68d6d7ac6285f7cd0d6294e2cee9212097e640655894762f0ac9020f69da9cf06f887dbeda8f9a7a217625359a2df82ebf082013 checksum: c004a37f4343139896059a706e96175a0f8975cc8807bcea96c099a68a94cf24d7869e685b06511389c9a6e4412acac5ef07614659983a7782f203012b78315b
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^5.15.1": "@mui/system@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/system@npm:5.15.1" resolution: "@mui/system@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@mui/private-theming": "npm:^5.15.1" "@mui/private-theming": "npm:^5.15.2"
"@mui/styled-engine": "npm:^5.15.1" "@mui/styled-engine": "npm:^5.15.2"
"@mui/types": "npm:^7.2.11" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.15.1" "@mui/utils": "npm:^5.15.2"
clsx: "npm:^2.0.0" clsx: "npm:^2.0.0"
csstype: "npm:^3.1.2" csstype: "npm:^3.1.2"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -1097,7 +1110,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 8e2e2cff80218ec5ea13ca5ce7d7b81e31f3e2ab3f0c3149230c8b221724a09635b1794ede9b65b3ec825bd062ede0eecbf839a00ba57c9091ce7799dc196129 checksum: 05335cc7856750a930e5eef4eaf3e935c1d6dd78add48e86d1d976736adea71c5f37f3c329fd0a8f5fd9d11e40775ab5a62192dc056d240cb365416ad4db5568
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1113,11 +1126,11 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^5.15.1": "@mui/utils@npm:^5.15.2":
version: 5.15.1 version: 5.15.2
resolution: "@mui/utils@npm:5.15.1" resolution: "@mui/utils@npm:5.15.2"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.5" "@babel/runtime": "npm:^7.23.6"
"@types/prop-types": "npm:^15.7.11" "@types/prop-types": "npm:^15.7.11"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
react-is: "npm:^18.2.0" react-is: "npm:^18.2.0"
@@ -1127,7 +1140,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 3d583ea55402295f9249f2fa1db652bbdca49df5227f731b067e04718d5704774e81b60b741231e49093eda6d4e80ce4fad315006516cb705acc7b0ac68f9d76 checksum: 9ede26d8e2b456a5ecf088d4e2d6903613be57eae97fcd30a9f31ff2c35a0e4329c728bd20c94c6f3468038935c3101a040c2cfb7dd6ff7a490811af0675d90a
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1676,15 +1689,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:^6.15.0": "@typescript-eslint/eslint-plugin@npm:^6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/eslint-plugin@npm:6.15.0" resolution: "@typescript-eslint/eslint-plugin@npm:6.16.0"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.5.1" "@eslint-community/regexpp": "npm:^4.5.1"
"@typescript-eslint/scope-manager": "npm:6.15.0" "@typescript-eslint/scope-manager": "npm:6.16.0"
"@typescript-eslint/type-utils": "npm:6.15.0" "@typescript-eslint/type-utils": "npm:6.16.0"
"@typescript-eslint/utils": "npm:6.15.0" "@typescript-eslint/utils": "npm:6.16.0"
"@typescript-eslint/visitor-keys": "npm:6.15.0" "@typescript-eslint/visitor-keys": "npm:6.16.0"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
graphemer: "npm:^1.4.0" graphemer: "npm:^1.4.0"
ignore: "npm:^5.2.4" ignore: "npm:^5.2.4"
@@ -1697,44 +1710,44 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 9020370c5e89b52b65ed2373c755d4b70f57ec7ebcf02d3e2f323f31ec81717af110d8e5f903b189b71e0a952f042e0fe2b637e77959c3102907efed4ba55512 checksum: 4bedce948ac3c20492a59813ee5d4f1f2306310857864dfaac2736f6c38e18785002c36844fd64c9fbdf3059fc390b29412be105fd7a118177f1eeeb1eb533f7
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:^6.15.0": "@typescript-eslint/parser@npm:^6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/parser@npm:6.15.0" resolution: "@typescript-eslint/parser@npm:6.16.0"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:6.15.0" "@typescript-eslint/scope-manager": "npm:6.16.0"
"@typescript-eslint/types": "npm:6.15.0" "@typescript-eslint/types": "npm:6.16.0"
"@typescript-eslint/typescript-estree": "npm:6.15.0" "@typescript-eslint/typescript-estree": "npm:6.16.0"
"@typescript-eslint/visitor-keys": "npm:6.15.0" "@typescript-eslint/visitor-keys": "npm:6.16.0"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
peerDependencies: peerDependencies:
eslint: ^7.0.0 || ^8.0.0 eslint: ^7.0.0 || ^8.0.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: fdd1f584e5068216c36a01e40750950ef309b36a522f6ecde36931690558a319960a702b4b4a806f335fb28ca99f8a07bb206571141550aaab1f6f40066f6605 checksum: 3d941ce345dc2ce29957e2110957662873d514b094b8939923c3281d858c11cd1f9058db862644afe14f68d087770f39a0a1f9e523a2013ed5d2fdf3421b34d0
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:6.15.0": "@typescript-eslint/scope-manager@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/scope-manager@npm:6.15.0" resolution: "@typescript-eslint/scope-manager@npm:6.16.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.15.0" "@typescript-eslint/types": "npm:6.16.0"
"@typescript-eslint/visitor-keys": "npm:6.15.0" "@typescript-eslint/visitor-keys": "npm:6.16.0"
checksum: 168d783c06a99784362e2eaaa56396b31716ee785779707ef984c2abb3e822c56440473efc6580cb8b84b2da508731ad184a00b3618bc7f3f93d8243804f2fcf checksum: 3360aae4b85f5c31d20ad48d771cc09a6f8f6b1811b00d94f06e55b5a09c610ac75631b1c4edecb3bec682d41351b87e7d14d42bee84aa032064d0e13463035b
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:6.15.0": "@typescript-eslint/type-utils@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/type-utils@npm:6.15.0" resolution: "@typescript-eslint/type-utils@npm:6.16.0"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:6.15.0" "@typescript-eslint/typescript-estree": "npm:6.16.0"
"@typescript-eslint/utils": "npm:6.15.0" "@typescript-eslint/utils": "npm:6.16.0"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.0.1" ts-api-utils: "npm:^1.0.1"
peerDependencies: peerDependencies:
@@ -1742,59 +1755,60 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 8dabb355f09f57de8b46d726ad95a57593e5b87427dee5182afecb490624424afec02b69a27018b352dcb5f930eb391cb8cdc12cd60a93231d4f04e63e2f2c0b checksum: 5964b87a87252bed278a248eb568902babd7c34defd3af8c3df371926d96aec716f33f1dc14bde170e93f73ed1b0af6e591e647853d0f33f378e2c7b3b73fc5b
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:6.15.0": "@typescript-eslint/types@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/types@npm:6.15.0" resolution: "@typescript-eslint/types@npm:6.16.0"
checksum: d55de64d532c9016c922cc36b86ab661d7d64d942057486a0bca7a7db07fade95c3de59bfe364bc76ab538fb979ca2e4e6744c3acf8919a2d61e73cc7f544363 checksum: 236ca318c2440c95068e5d4d147e2bfed62447775e18695e21c8ca04a341a74d01c37ed2b417629b7bf2fb91ad4fd5e2a6570215d16fc24dd1507ce6973b4e22
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:6.15.0": "@typescript-eslint/typescript-estree@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/typescript-estree@npm:6.15.0" resolution: "@typescript-eslint/typescript-estree@npm:6.16.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.15.0" "@typescript-eslint/types": "npm:6.16.0"
"@typescript-eslint/visitor-keys": "npm:6.15.0" "@typescript-eslint/visitor-keys": "npm:6.16.0"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
globby: "npm:^11.1.0" globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3" is-glob: "npm:^4.0.3"
minimatch: "npm:9.0.3"
semver: "npm:^7.5.4" semver: "npm:^7.5.4"
ts-api-utils: "npm:^1.0.1" ts-api-utils: "npm:^1.0.1"
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 920f7f3bfe463a9da943e1a686b7f13ac802a5e33be52f39ac711aa53a1e274dbe173b41bba05581c560fabfc3e1fadcfd81ab53a036afe25fb1a76651fcad7a checksum: 8e1ef03ecabaf3791b11240a51217836dbb74850e458258db77ac5eab5508cd9c63fb671924993d1e7654718c0c857c3550d51ecba0845fe489d143bb858e1b1
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:6.15.0": "@typescript-eslint/utils@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/utils@npm:6.15.0" resolution: "@typescript-eslint/utils@npm:6.16.0"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0" "@eslint-community/eslint-utils": "npm:^4.4.0"
"@types/json-schema": "npm:^7.0.12" "@types/json-schema": "npm:^7.0.12"
"@types/semver": "npm:^7.5.0" "@types/semver": "npm:^7.5.0"
"@typescript-eslint/scope-manager": "npm:6.15.0" "@typescript-eslint/scope-manager": "npm:6.16.0"
"@typescript-eslint/types": "npm:6.15.0" "@typescript-eslint/types": "npm:6.16.0"
"@typescript-eslint/typescript-estree": "npm:6.15.0" "@typescript-eslint/typescript-estree": "npm:6.16.0"
semver: "npm:^7.5.4" semver: "npm:^7.5.4"
peerDependencies: peerDependencies:
eslint: ^7.0.0 || ^8.0.0 eslint: ^7.0.0 || ^8.0.0
checksum: 7895240933ad28295508f8c4286a8b905550a35eda83a11ecf9511e53078e0af07e75a1872f1bc757f165b41fdc84616ea97c1e2e3bf80cff985935f25596228 checksum: 84dd02f7c8e47fae699cc222da5cbea08b28c6e1cc7827860430bc86c2a17ee3f86e198a4356902b95930f85785aa662266ea9c476f69bf80c6a5f648e55f9f4
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:6.15.0": "@typescript-eslint/visitor-keys@npm:6.16.0":
version: 6.15.0 version: 6.16.0
resolution: "@typescript-eslint/visitor-keys@npm:6.15.0" resolution: "@typescript-eslint/visitor-keys@npm:6.16.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.15.0" "@typescript-eslint/types": "npm:6.16.0"
eslint-visitor-keys: "npm:^3.4.1" eslint-visitor-keys: "npm:^3.4.1"
checksum: 4641a829485f67a5d9d3558aa0d152e5ab57b468cfd9653168ce9a141e1f051730669a024505183b64f7a7e5d8f62533af4ebd4ad7366b551390461e9c45ec18 checksum: 19e559f14ea0092585a374b8c5f1aca9b6b271fc23909d9857de9cf71a1e1d3abc0afd237e9c02d7a5fbdfe8e3be7853cf9fedf40a6f16bac3495cb7f4e67982
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1811,10 +1825,10 @@ __metadata:
dependencies: dependencies:
"@alova/adapter-xhr": "npm:^1.0.2" "@alova/adapter-xhr": "npm:^1.0.2"
"@babel/core": "npm:^7.23.6" "@babel/core": "npm:^7.23.6"
"@emotion/react": "npm:^11.11.1" "@emotion/react": "npm:^11.11.3"
"@emotion/styled": "npm:^11.11.0" "@emotion/styled": "npm:^11.11.0"
"@mui/icons-material": "npm:^5.15.1" "@mui/icons-material": "npm:^5.15.2"
"@mui/material": "npm:^5.15.1" "@mui/material": "npm:^5.15.2"
"@preact/compat": "npm:^17.1.2" "@preact/compat": "npm:^17.1.2"
"@preact/preset-vite": "npm:^2.7.0" "@preact/preset-vite": "npm:^2.7.0"
"@table-library/react-table-library": "npm:4.1.7" "@table-library/react-table-library": "npm:4.1.7"
@@ -1824,9 +1838,9 @@ __metadata:
"@types/react": "npm:^18.2.45" "@types/react": "npm:^18.2.45"
"@types/react-dom": "npm:^18.2.18" "@types/react-dom": "npm:^18.2.18"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
"@typescript-eslint/eslint-plugin": "npm:^6.15.0" "@typescript-eslint/eslint-plugin": "npm:^6.16.0"
"@typescript-eslint/parser": "npm:^6.15.0" "@typescript-eslint/parser": "npm:^6.16.0"
alova: "npm:^2.16.1" alova: "npm:^2.16.2"
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
concurrently: "npm:^8.2.2" concurrently: "npm:^8.2.2"
eslint: "npm:^8.56.0" eslint: "npm:^8.56.0"
@@ -1852,7 +1866,7 @@ __metadata:
react-icons: "npm:^4.12.0" react-icons: "npm:^4.12.0"
react-router-dom: "npm:^6.21.1" react-router-dom: "npm:^6.21.1"
react-toastify: "npm:^9.1.3" react-toastify: "npm:^9.1.3"
rollup-plugin-visualizer: "npm:^5.11.0" rollup-plugin-visualizer: "npm:^5.12.0"
sockette: "npm:^2.0.6" sockette: "npm:^2.0.6"
terser: "npm:^5.26.0" terser: "npm:^5.26.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
@@ -1928,10 +1942,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"alova@npm:^2.16.1": "alova@npm:^2.16.2":
version: 2.16.1 version: 2.16.2
resolution: "alova@npm:2.16.1" resolution: "alova@npm:2.16.2"
checksum: 88f0a175ed433606ff5f564151fc92e2d16e04a04f87362cbe76c1f0c33382e49719ce48f081fe03f707c28b78200c50b933155051d9a82be1d4bfcb73f1d0f9 checksum: 06fafddf380d4d8e8e5dd172ebcaa0bc229c76c11b2675cfb2c0ab884a36d4818159267adb14ec7a3cbe681464793085b0386d7741e6a6a732c764b14c8783a8
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6164,6 +6178,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:9.0.3, minimatch@npm:^9.0.1":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
dependencies:
brace-expansion: "npm:^2.0.1"
checksum: c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
languageName: node
linkType: hard
"minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": "minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2":
version: 3.1.2 version: 3.1.2
resolution: "minimatch@npm:3.1.2" resolution: "minimatch@npm:3.1.2"
@@ -6173,15 +6196,6 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:^9.0.1":
version: 9.0.3
resolution: "minimatch@npm:9.0.3"
dependencies:
brace-expansion: "npm:^2.0.1"
checksum: c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
languageName: node
linkType: hard
"minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.6": "minimist@npm:^1.1.3, minimist@npm:^1.2.0, minimist@npm:^1.2.6":
version: 1.2.8 version: 1.2.8
resolution: "minimist@npm:1.2.8" resolution: "minimist@npm:1.2.8"
@@ -7436,9 +7450,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"rollup-plugin-visualizer@npm:^5.11.0": "rollup-plugin-visualizer@npm:^5.12.0":
version: 5.11.0 version: 5.12.0
resolution: "rollup-plugin-visualizer@npm:5.11.0" resolution: "rollup-plugin-visualizer@npm:5.12.0"
dependencies: dependencies:
open: "npm:^8.4.0" open: "npm:^8.4.0"
picomatch: "npm:^2.3.1" picomatch: "npm:^2.3.1"
@@ -7451,7 +7465,7 @@ __metadata:
optional: true optional: true
bin: bin:
rollup-plugin-visualizer: dist/bin/cli.js rollup-plugin-visualizer: dist/bin/cli.js
checksum: 947238aa22706a47a4d3e8ce616855f0e5cb969ed9f61b9a268eaede0a86f461ecb38e27b4e6bf00f4b5e3f63677667f65e0d4af89a659a5160f74add1f192bb checksum: 47358feb672291d6edcfd94197577c192a84c24cb644119425dae8241fb6f5a52556efd0c501f38b276c07534642a80c0885ef681babb474e83c7b5a3b475b84
languageName: node languageName: node
linkType: hard linkType: hard

2
mock-api/package.json
View File

@@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"@msgpack/msgpack": "^2.8.0", "@msgpack/msgpack": "^2.8.0",
"busboy": "^1.6.0", "busboy": "^1.6.0",
"itty-router": "^4.0.23" "itty-router": "^4.0.25"
}, },
"packageManager": "yarn@4.0.2", "packageManager": "yarn@4.0.2",
"devDependencies": { "devDependencies": {

10
mock-api/yarn.lock
View File

@@ -129,7 +129,7 @@ __metadata:
"@msgpack/msgpack": "npm:^2.8.0" "@msgpack/msgpack": "npm:^2.8.0"
"@types/multer": "npm:^1.4.11" "@types/multer": "npm:^1.4.11"
busboy: "npm:^1.6.0" busboy: "npm:^1.6.0"
itty-router: "npm:^4.0.23" itty-router: "npm:^4.0.25"
languageName: unknown languageName: unknown
linkType: soft linkType: soft
@@ -142,10 +142,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"itty-router@npm:^4.0.23": "itty-router@npm:^4.0.25":
version: 4.0.23 version: 4.0.25
resolution: "itty-router@npm:4.0.23" resolution: "itty-router@npm:4.0.25"
checksum: b412f80f7d3bf78293144a43c47053c9873c98565e58aa188a66306cc6018ad3801fa157b0d694e9e1719cbc0424fcd89951f1916699eff6606f30b0645afa3e checksum: befa18a3cda3ab5fcbd21bcdeb87fd5c115e9538c0f5372170a7a73fb36906e373ea1be677d6b9c3cf1864c0f957caf37376e1f2b9e19fc275340fb0cbcbcb18
languageName: node languageName: node
linkType: hard linkType: hard

8
src/mqtt.cpp
View File

@@ -1194,12 +1194,16 @@ bool Mqtt::publish_ha_climate_config(const uint8_t tag, const bool has_roomtemp,
snprintf(mode_str_tpl, snprintf(mode_str_tpl,
sizeof(mode_str_tpl), sizeof(mode_str_tpl),
"{%%if %s%%}off{%%elif %s=='manual'%%}heat{%%elif %s=='day'%%}heat{%%elif %s=='night'%%}off{%%elif %s=='off'%%}off{%%else%%}auto{%%endif%%}", "{%%if %s%%}off{%%elif %s=='%s'%%}heat{%%elif %s=='%s'%%}heat{%%elif %s=='%s'%%}off{%%elif %s=='%s'%%}off{%%else%%}auto{%%endif%%}",
hc_mode_cond, hc_mode_cond,
hc_mode_s, hc_mode_s,
Helpers::translated_word(FL_(manual)),
hc_mode_s, hc_mode_s,
Helpers::translated_word(FL_(day)),
hc_mode_s, hc_mode_s,
hc_mode_s); Helpers::translated_word(FL_(night)),
hc_mode_s,
Helpers::translated_word(FL_(off)));
snprintf(name_s, sizeof(name_s), "Hc%d", hc_num); snprintf(name_s, sizeof(name_s), "Hc%d", hc_num);

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.5-dev.6" #define EMSESP_APP_VERSION "3.6.5-dev.7"