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

Merge pull request #1831 from proddy/dev

Browse Source 
prep for modbus merge
This commit is contained in:
Proddy
2024-06-29 10:06:38 +01:00
committed by GitHub
parent 66470071f6 2155c2e70f
commit 463fbd69c8
4 changed files with 346 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -24,6 +24,7 @@
- Modules - external linkable module library [#1778](https://github.com/emsesp/EMS-ESP32/issues/1778) - Modules - external linkable module library [#1778](https://github.com/emsesp/EMS-ESP32/issues/1778)
- Scheduler onChange and Conditions [#1806](https://github.com/emsesp/EMS-ESP32/issues/1806) - Scheduler onChange and Conditions [#1806](https://github.com/emsesp/EMS-ESP32/issues/1806)
- make remote control timeout editable [#1774](https://github.com/emsesp/EMS-ESP32/issues/1774) - make remote control timeout editable [#1774](https://github.com/emsesp/EMS-ESP32/issues/1774)
- added extra pump characteristics (mode and pressure for EMS+) by @SLTKA [#1802](https://github.com/emsesp/EMS-ESP32/pull/1802)
## Fixed ## Fixed

530
dump_entities.csv
View File

File diff suppressed because it is too large Load Diff

8
interface/package.json
View File

@@ -26,8 +26,8 @@
"@alova/scene-react": "^1.6.1", "@alova/scene-react": "^1.6.1",
"@emotion/react": "^11.11.4", "@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5", "@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.20", "@mui/icons-material": "^5.15.21",
"@mui/material": "^5.15.20", "@mui/material": "^5.15.21",
"@table-library/react-table-library": "4.1.7", "@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.12", "@types/lodash-es": "^4.17.12",
"@types/node": "^20.14.9", "@types/node": "^20.14.9",
@@ -51,13 +51,13 @@
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.24.7", "@babel/core": "^7.24.7",
"@eslint/js": "^9.5.0", "@eslint/js": "^9.6.0",
"@preact/compat": "^17.1.2", "@preact/compat": "^17.1.2",
"@preact/preset-vite": "^2.8.3", "@preact/preset-vite": "^2.8.3",
"@trivago/prettier-plugin-sort-imports": "^4.3.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/babel__core": "^7", "@types/babel__core": "^7",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"eslint": "^9.5.0", "eslint": "^9.6.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"preact": "^10.22.0", "preact": "^10.22.0",
"prettier": "^3.3.2", "prettier": "^3.3.2",

88
interface/yarn.lock
View File

@@ -917,14 +917,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@eslint/config-array@npm:^0.16.0": "@eslint/config-array@npm:^0.17.0":
version: 0.16.0 version: 0.17.0
resolution: "@eslint/config-array@npm:0.16.0" resolution: "@eslint/config-array@npm:0.17.0"
dependencies: dependencies:
"@eslint/object-schema": "npm:^2.1.4" "@eslint/object-schema": "npm:^2.1.4"
debug: "npm:^4.3.1" debug: "npm:^4.3.1"
minimatch: "npm:^3.0.5" minimatch: "npm:^3.1.2"
checksum: 10c0/b9d04409151dc95ec6b5e04e1e185a808d58e18cfc7340adc1e9420a5ff15843a0a308fb2cd9a2b354652885c2bebbcd5515814e93e9c9133f423891b6e53c70 checksum: 10c0/97eb23ef0948dbc5f24884a3b75c537ca37ee2b1f27a864cd0d9189c089bc1a724dc6e1a4d9b7dd304d9f732ca02aa7916243a7715d6f1f17159d8a8c83f0c9e
languageName: node languageName: node
linkType: hard linkType: hard
@@ -945,10 +945,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@eslint/js@npm:9.5.0, @eslint/js@npm:^9.5.0": "@eslint/js@npm:9.6.0, @eslint/js@npm:^9.6.0":
version: 9.5.0 version: 9.6.0
resolution: "@eslint/js@npm:9.5.0" resolution: "@eslint/js@npm:9.6.0"
checksum: 10c0/dacf51ec2d5b4c8d1315d21a0ff761235d9e39b2391cb945138c58dc512a6c18949c40b644235f5c4fdf5b637ef8f881214acc496dddf46b718529bf22af42ac checksum: 10c0/83967a7e59f2e958c9bbb3acd0929cad00d59d927ad786ed8e0d30b07f983c6bea3af6f4ad32da32145db40b7a741a816ba339bdd8960fc7fc8231716d943b7f
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1099,16 +1099,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.15.20": "@mui/core-downloads-tracker@npm:^5.15.21":
version: 5.15.20 version: 5.15.21
resolution: "@mui/core-downloads-tracker@npm:5.15.20" resolution: "@mui/core-downloads-tracker@npm:5.15.21"
checksum: 10c0/0e1f9aa9c85d5f60fa5937edc22dfbebd512671379e3adb7c99a8ef0928bf42daed98cede41a407e810a225554943675e9d976bc0ae17acdc20445c8d2f121b3 checksum: 10c0/986d03f08253c839f142f15d2ec8f0b889eb802cdd0306e6fbc678b50689d42334bb8e1d85ca46fa7ff5c69a76657a91830e672059341dc7c1fd74b1cd134481
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^5.15.20": "@mui/icons-material@npm:^5.15.21":
version: 5.15.20 version: 5.15.21
resolution: "@mui/icons-material@npm:5.15.20" resolution: "@mui/icons-material@npm:5.15.21"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
peerDependencies: peerDependencies:
@@ -1118,17 +1118,17 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/3765340625ad0c5181cffbec1a9a52185e9add4d2eda1f8c3e262b11bf9ca1e8cdf87f67f550b300d8c3c31277b7c8bb38261c964f6180d31b3e928a1dc03315 checksum: 10c0/28685825504a24aa497715ec519014e780e570d00e8edc8f3423da2cb55b2aa2c44e829429efc9059d82542035e6f121d79a9f503cb6ae19439aca9e5321e959
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.15.20": "@mui/material@npm:^5.15.21":
version: 5.15.20 version: 5.15.21
resolution: "@mui/material@npm:5.15.20" resolution: "@mui/material@npm:5.15.21"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.9" "@babel/runtime": "npm:^7.23.9"
"@mui/base": "npm:5.0.0-beta.40" "@mui/base": "npm:5.0.0-beta.40"
"@mui/core-downloads-tracker": "npm:^5.15.20" "@mui/core-downloads-tracker": "npm:^5.15.21"
"@mui/system": "npm:^5.15.20" "@mui/system": "npm:^5.15.20"
"@mui/types": "npm:^7.2.14" "@mui/types": "npm:^7.2.14"
"@mui/utils": "npm:^5.15.20" "@mui/utils": "npm:^5.15.20"
@@ -1151,7 +1151,7 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/0882661f83f5b73c06d6402ddd9c0f8e471198b838c4a456db03a5256d8febc688abc41645156d155536106a44bd28798efcfdaec00b665ab91dbd5c9dee83eb checksum: 10c0/005f8ec036f0742e35c7cf6e3bd6280cd996b416bfdc6ee05ba625d1a62a41bbc077a5244b71eba01016fa0df2b1ba115ef7028c962eed1bdd98108fab024a6e
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1988,9 +1988,9 @@ __metadata:
"@babel/core": "npm:^7.24.7" "@babel/core": "npm:^7.24.7"
"@emotion/react": "npm:^11.11.4" "@emotion/react": "npm:^11.11.4"
"@emotion/styled": "npm:^11.11.5" "@emotion/styled": "npm:^11.11.5"
"@eslint/js": "npm:^9.5.0" "@eslint/js": "npm:^9.6.0"
"@mui/icons-material": "npm:^5.15.20" "@mui/icons-material": "npm:^5.15.21"
"@mui/material": "npm:^5.15.20" "@mui/material": "npm:^5.15.21"
"@preact/compat": "npm:^17.1.2" "@preact/compat": "npm:^17.1.2"
"@preact/preset-vite": "npm:^2.8.3" "@preact/preset-vite": "npm:^2.8.3"
"@table-library/react-table-library": "npm:4.1.7" "@table-library/react-table-library": "npm:4.1.7"
@@ -2004,7 +2004,7 @@ __metadata:
alova: "npm:^2.21.3" alova: "npm:^2.21.3"
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
concurrently: "npm:^8.2.2" concurrently: "npm:^8.2.2"
eslint: "npm:^9.5.0" eslint: "npm:^9.6.0"
eslint-config-prettier: "npm:^9.1.0" eslint-config-prettier: "npm:^9.1.0"
history: "npm:^5.3.0" history: "npm:^5.3.0"
jwt-decode: "npm:^4.0.0" jwt-decode: "npm:^4.0.0"
@@ -2054,6 +2054,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"acorn@npm:^8.12.0":
version: 8.12.0
resolution: "acorn@npm:8.12.0"
bin:
acorn: bin/acorn
checksum: 10c0/a19f9dead009d3b430fa3c253710b47778cdaace15b316de6de93a68c355507bc1072a9956372b6c990cbeeb167d4a929249d0faeb8ae4bb6911d68d53299549
languageName: node
linkType: hard
"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": "agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
version: 7.1.1 version: 7.1.1
resolution: "agent-base@npm:7.1.1" resolution: "agent-base@npm:7.1.1"
@@ -3491,15 +3500,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"eslint@npm:^9.5.0": "eslint@npm:^9.6.0":
version: 9.5.0 version: 9.6.0
resolution: "eslint@npm:9.5.0" resolution: "eslint@npm:9.6.0"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.2.0" "@eslint-community/eslint-utils": "npm:^4.2.0"
"@eslint-community/regexpp": "npm:^4.6.1" "@eslint-community/regexpp": "npm:^4.6.1"
"@eslint/config-array": "npm:^0.16.0" "@eslint/config-array": "npm:^0.17.0"
"@eslint/eslintrc": "npm:^3.1.0" "@eslint/eslintrc": "npm:^3.1.0"
"@eslint/js": "npm:9.5.0" "@eslint/js": "npm:9.6.0"
"@humanwhocodes/module-importer": "npm:^1.0.1" "@humanwhocodes/module-importer": "npm:^1.0.1"
"@humanwhocodes/retry": "npm:^0.3.0" "@humanwhocodes/retry": "npm:^0.3.0"
"@nodelib/fs.walk": "npm:^1.2.8" "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3510,7 +3519,7 @@ __metadata:
escape-string-regexp: "npm:^4.0.0" escape-string-regexp: "npm:^4.0.0"
eslint-scope: "npm:^8.0.1" eslint-scope: "npm:^8.0.1"
eslint-visitor-keys: "npm:^4.0.0" eslint-visitor-keys: "npm:^4.0.0"
espree: "npm:^10.0.1" espree: "npm:^10.1.0"
esquery: "npm:^1.5.0" esquery: "npm:^1.5.0"
esutils: "npm:^2.0.2" esutils: "npm:^2.0.2"
fast-deep-equal: "npm:^3.1.3" fast-deep-equal: "npm:^3.1.3"
@@ -3531,7 +3540,7 @@ __metadata:
text-table: "npm:^0.2.0" text-table: "npm:^0.2.0"
bin: bin:
eslint: bin/eslint.js eslint: bin/eslint.js
checksum: 10c0/1c83d94ccfd6d97474aaaf463714eba7afa040639ad9191db430d34e9e2851ba14510651de69b52f26ee30611caf0fa4c66b3fb73bb71df6ab10cef5bb44bb32 checksum: 10c0/82ea5ad3f28aaef89e2a98f4e6df0eae9d4e16ccd6d667c69977042e0b103fa5df98bf16d3df72d1ae77edd8c1dccfdf4afa2a55309aa8081a1bc54af6229826
languageName: node languageName: node
linkType: hard linkType: hard
@@ -3546,6 +3555,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"espree@npm:^10.1.0":
version: 10.1.0
resolution: "espree@npm:10.1.0"
dependencies:
acorn: "npm:^8.12.0"
acorn-jsx: "npm:^5.3.2"
eslint-visitor-keys: "npm:^4.0.0"
checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0
languageName: node
linkType: hard
"esquery@npm:^1.5.0": "esquery@npm:^1.5.0":
version: 1.5.0 version: 1.5.0
resolution: "esquery@npm:1.5.0" resolution: "esquery@npm:1.5.0"
@@ -5267,7 +5287,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": "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"
dependencies: dependencies: