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 #2154 from proddy/dev

Browse Source 
updates to 3.7.1
This commit is contained in:
Proddy
2024-10-30 18:10:40 +01:00
committed by GitHub
parent 8bf97c067f fd81dc9f5b
commit 2df67c2d64
20 changed files with 2093 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@@ -30,13 +30,8 @@ stats.html
*.sln *.sln
*.sw? *.sw?
.pnp.* .pnp.*
*/.yarn/* */.yarn/cache/*
!.yarn/patches */.yarn/install-state.gz
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
yarn.lock
analyse.html analyse.html
interface/vite.config.ts.timestamp* interface/vite.config.ts.timestamp*
*.local *.local
@@ -71,4 +66,3 @@ words-found-verbose.txt
# sonarlint # sonarlint
compile_commands.json compile_commands.json
package.json

4
README.md
View File

@@ -34,9 +34,7 @@ It requires a small circuit to interface with the EMS bus which can be purchased
## **Installing** ## **Installing**
For a quick install of the latest stable release go to [https://install.emsesp.org](https://install.emsesp.org). For other methods of installing and upgrading, and switching over to the development version go to [this section](https://emsesp.org/Getting-Started/#first-time-install) in the documentation. Head over to [download.emsesp.org](https://download.emsesp.org) for instructions on how to install EMS-ESP. There is also further details on which boards are supported in [this section](https://emsesp.org/Getting-Started/#first-time-install) of the documentation.
If you're upgrading a BBQKees Electronics EMS Gateway and unsure which firmware to use, please refer to the [this overview](https://emsesp.org/Getting-Started/#bbqkees-electronics-ems-gateway).
## **Documentation** ## **Documentation**

85
data/pre_load.json Normal file
View File

@@ -0,0 +1,85 @@
{
"type": "settings",
"Network": {
"ssid": "my_wifi_ssid",
"bssid": "",
"password": "my_wifi_password",
"hostname": "ems-esp"
},
"AP": {
"provision_mode": 2,
"ssid": "ems-esp",
"password": "ems-esp-neo",
"channel": 1,
"ssid_hidden": false,
"max_clients": 4,
"local_ip": "192.168.4.1",
"gateway_ip": "192.168.4.1",
"subnet_mask": "255.255.255.0"
},
"MQTT": {
"enableTLS": false,
"rootCA": "",
"enabled": false,
"host": "127.0.0.1",
"port": 1883,
"base": "ems-esp",
"username": "username",
"password": "password",
"client_id": "ems-esp",
"entity_format": 1,
"publish_time_boiler": 10,
"publish_time_thermostat": 10,
"publish_time_solar": 10,
"publish_time_mixer": 10,
"publish_time_water": 10,
"publish_time_other": 60,
"publish_time_sensor": 10,
"publish_time_heartbeat": 60,
"mqtt_qos": 0,
"mqtt_retain": false,
"ha_enabled": false,
"nested_format": 1,
"discovery_prefix": "homeassistant",
"discovery_type": 0,
"publish_single": false,
"publish_single2cmd": false,
"send_response": false
},
"NTP": {
"enabled": true,
"server": "time.google.com",
"tz_label": "Europe/Amsterdam",
"tz_format": "CET-1CEST,M3.5.0,M10.5.0/3"
},
"Security": {
"jwt_secret": "ems-esp-neo",
"users": [
{
"username": "admin",
"password": "admin",
"admin": true
},
{
"username": "guest",
"password": "guest",
"admin": false
}
]
},
"Settings": {
"board_profile": "S3",
"locale": "en",
"tx_mode": 1,
"ems_bus_id": 11,
"boiler_heatingoff": false,
"hide_led": true,
"telnet_enabled": true,
"notoken_api": false,
"analog_enabled": true,
"fahrenheit": false,
"bool_format": 1,
"bool_dashboard": 1,
"enum_format": 1
}
}

934
interface/.yarn/releases/yarn-4.5.1.cjs vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
interface/.yarnrc.yml
View File

@@ -1 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.5.1.cjs

12
interface/package.json
View File

@@ -12,9 +12,9 @@
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted", "build-hosted": "typesafe-i18n --no-watch && vite build --mode hosted",
"preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"npm:mock-rest\" \"vite preview\"", "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"yarn:mock-rest\" \"vite preview\"",
"mock-rest": "bun --watch ../mock-api/rest_server.ts", "mock-rest": "bun --watch ../mock-api/rest_server.ts",
"standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"npm:mock-rest\" \"vite\"", "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"yarn:mock-rest\" \"vite\"",
"typesafe-i18n": "typesafe-i18n --no-watch", "typesafe-i18n": "typesafe-i18n --no-watch",
"webUI": "node progmem-generator.js", "webUI": "node progmem-generator.js",
"format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'", "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
@@ -24,8 +24,8 @@
"@alova/adapter-xhr": "2.0.9", "@alova/adapter-xhr": "2.0.9",
"@emotion/react": "^11.13.3", "@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0", "@emotion/styled": "^11.13.0",
"@mui/icons-material": "^6.1.5", "@mui/icons-material": "^6.1.6",
"@mui/material": "^6.1.5", "@mui/material": "^6.1.6",
"@table-library/react-table-library": "4.1.7", "@table-library/react-table-library": "4.1.7",
"alova": "3.1.1", "alova": "3.1.1",
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
@@ -47,7 +47,7 @@
"@preact/preset-vite": "^2.9.1", "@preact/preset-vite": "^2.9.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0", "@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/formidable": "^3", "@types/formidable": "^3",
"@types/node": "^22.8.1", "@types/node": "^22.8.4",
"@types/react": "^18.3.12", "@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1", "@types/react-dom": "^18.3.1",
"@types/react-router-dom": "^5.3.3", "@types/react-router-dom": "^5.3.3",
@@ -58,7 +58,7 @@
"prettier": "^3.3.3", "prettier": "^3.3.3",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"terser": "^5.36.0", "terser": "^5.36.0",
"typescript-eslint": "8.11.0", "typescript-eslint": "8.12.2",
"vite": "^5.4.10", "vite": "^5.4.10",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.0.1" "vite-tsconfig-paths": "^5.0.1"

235
interface/yarn.lock
View File

@@ -266,7 +266,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.25.7, @babel/runtime@npm:^7.5.5, @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.26.0, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.8.7":
version: 7.26.0 version: 7.26.0
resolution: "@babel/runtime@npm:7.26.0" resolution: "@babel/runtime@npm:7.26.0"
dependencies: dependencies:
@@ -826,38 +826,38 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^6.1.5": "@mui/core-downloads-tracker@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/core-downloads-tracker@npm:6.1.5" resolution: "@mui/core-downloads-tracker@npm:6.1.6"
checksum: 10c0/c8767b7a8046e669ea687108dd2c62352e48c61379657a1b88798c12ec47cc3f99eedf30758294a17a81f2dcef22aeb08f992aecdf6e0876f312d345ba1d5f3d checksum: 10c0/538c561dc46e040ebc5ea884428dccc427fdddbd3747890d96ae52648eed5f7dec4dc8294927b58ff4b7481c0a813dcb16b9d7b9b08cc43871d2d55ebd1a8002
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^6.1.5": "@mui/icons-material@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/icons-material@npm:6.1.5" resolution: "@mui/icons-material@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
peerDependencies: peerDependencies:
"@mui/material": ^6.1.5 "@mui/material": ^6.1.6
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/112f7570b8d27019a16b619a3a5b9f01cb7d8a244d50014596e17f06ed5f569888aeac2223c058da37567b5a358c99a53ee2afdf8958bc4a34b964a02f796787 checksum: 10c0/a6eb10be3cc356fd404febf29a3b26fa63b6b09d3148736fb05279954905186e9804869ff18220840ae92dbdeddfd407c2d0c72b9e165e01fd6bbc620b6b39d7
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^6.1.5": "@mui/material@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/material@npm:6.1.5" resolution: "@mui/material@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
"@mui/core-downloads-tracker": "npm:^6.1.5" "@mui/core-downloads-tracker": "npm:^6.1.6"
"@mui/system": "npm:^6.1.5" "@mui/system": "npm:^6.1.6"
"@mui/types": "npm:^7.2.18" "@mui/types": "npm:^7.2.19"
"@mui/utils": "npm:^6.1.5" "@mui/utils": "npm:^6.1.6"
"@popperjs/core": "npm:^2.11.8" "@popperjs/core": "npm:^2.11.8"
"@types/react-transition-group": "npm:^4.4.11" "@types/react-transition-group": "npm:^4.4.11"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
@@ -868,7 +868,7 @@ __metadata:
peerDependencies: peerDependencies:
"@emotion/react": ^11.5.0 "@emotion/react": ^11.5.0
"@emotion/styled": ^11.3.0 "@emotion/styled": ^11.3.0
"@mui/material-pigment-css": ^6.1.5 "@mui/material-pigment-css": ^6.1.6
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
react: ^17.0.0 || ^18.0.0 || ^19.0.0 react: ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -881,16 +881,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/982a2446fd511a952627aa8567e302528ad3a2ad8b3125574a38facaef2a5a076a723c67076682f95b09f9fe4dbf3445213fe6655658d23419b49440ae11873e checksum: 10c0/b54c0b01f33f63a700ec7b13d615dd3a109497ee48a1af0f750f780112a7034fbecfcecf29ad67aa62ec12047d465fbcb243052d8680ce681240096fef1f8d63
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^6.1.5": "@mui/private-theming@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/private-theming@npm:6.1.5" resolution: "@mui/private-theming@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
"@mui/utils": "npm:^6.1.5" "@mui/utils": "npm:^6.1.6"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -898,15 +898,15 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/3a5a470c78daa60fa3c9346a15617ab4d6ad3c544b564fe4b2fe6f3155cb4955b0c670395a9074e91956b1cb50bca96fc07d03cad92759147bebadcacd00f36c checksum: 10c0/d9138bd3ae8b318b0f14e3d9a9aa414f31698ce3934b94f0a1e78d9c2c37fd3d2b24a6bd45ded321ffc41658e70fc055226b9c1b9767695a93c927adf54302a0
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/styled-engine@npm:^6.1.5": "@mui/styled-engine@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/styled-engine@npm:6.1.5" resolution: "@mui/styled-engine@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
"@emotion/cache": "npm:^11.13.1" "@emotion/cache": "npm:^11.13.1"
"@emotion/serialize": "npm:^1.3.2" "@emotion/serialize": "npm:^1.3.2"
"@emotion/sheet": "npm:^1.4.0" "@emotion/sheet": "npm:^1.4.0"
@@ -921,19 +921,19 @@ __metadata:
optional: true optional: true
"@emotion/styled": "@emotion/styled":
optional: true optional: true
checksum: 10c0/7a4830a7f1736d399c06d414cd6762ff4a830e976946da4a58b77e864b6d6abb4385800e644367e57c670397bf1f12690e82ffe05f185c85c8dafd132a67ca2a checksum: 10c0/2554248f83db98b404b299494c4f039fe5a1f1b9166fc95268958ea00aa3be04915ffbabe0ea418cb2d600e11b6d08f765ddd23240a63e6d06161d07eaac6aa8
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^6.1.5": "@mui/system@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/system@npm:6.1.5" resolution: "@mui/system@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
"@mui/private-theming": "npm:^6.1.5" "@mui/private-theming": "npm:^6.1.6"
"@mui/styled-engine": "npm:^6.1.5" "@mui/styled-engine": "npm:^6.1.6"
"@mui/types": "npm:^7.2.18" "@mui/types": "npm:^7.2.19"
"@mui/utils": "npm:^6.1.5" "@mui/utils": "npm:^6.1.6"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
csstype: "npm:^3.1.3" csstype: "npm:^3.1.3"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -949,28 +949,28 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/7e8ce81b7e6a5810c0856427dbd7f89f62a23ab151e0199813e7cd7e9d47e4719004f6b576c5cad0121735cfb0c984ea022c494796202e2c0c054c6a60995c40 checksum: 10c0/125d38ad5b0d610cfedace8253e43b4be47b46ad2d96eeac019c6c37b4f09286512e2280924753f8bb0314c4d7cc5e8f03fc7f97cf9830c4f6d1869b721eb8c2
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/types@npm:^7.2.18": "@mui/types@npm:^7.2.19":
version: 7.2.18 version: 7.2.19
resolution: "@mui/types@npm:7.2.18" resolution: "@mui/types@npm:7.2.19"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0 "@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/338404bdef7c7f9ebcd389ebbf429c44d2cc9c25c65d8669dc900a24b2c8718240482273bf6cd953578965e3838ad40a8e7376c71d3d9146be3afb88bff1b67a checksum: 10c0/9c390d7eddc7e7c396852202fdca021aee275391bc7f48d0b6458748bf75eebb34c73109958692655ba5e72946cf47db2c0c7d2e1c26be568599ed65c931d080
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^6.1.5": "@mui/utils@npm:^6.1.6":
version: 6.1.5 version: 6.1.6
resolution: "@mui/utils@npm:6.1.5" resolution: "@mui/utils@npm:6.1.6"
dependencies: dependencies:
"@babel/runtime": "npm:^7.25.7" "@babel/runtime": "npm:^7.26.0"
"@mui/types": "npm:^7.2.18" "@mui/types": "npm:^7.2.19"
"@types/prop-types": "npm:^15.7.13" "@types/prop-types": "npm:^15.7.13"
clsx: "npm:^2.1.1" clsx: "npm:^2.1.1"
prop-types: "npm:^15.8.1" prop-types: "npm:^15.8.1"
@@ -981,7 +981,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10c0/899191334f321aedf993e6a79cd63ac511e8ef23a84c1e156ca4a82c407e97f86f9f3d4250765f5c9e71d9af963bdc738e6d63fc62f9088fc5ad9c055fc3b111 checksum: 10c0/8752b3ca3fa1cee7f1a8477b6babcd80fef01724f7d8106c8665a252ec960ca38ef5f4fe21cfb60ee11176a9a8034400420d5b0719953ecc2c4f25980682614c
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1426,7 +1426,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:*, @types/node@npm:^22.8.1": "@types/node@npm:*":
version: 22.8.1 version: 22.8.1
resolution: "@types/node@npm:22.8.1" resolution: "@types/node@npm:22.8.1"
dependencies: dependencies:
@@ -1435,6 +1435,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/node@npm:^22.8.4":
version: 22.8.4
resolution: "@types/node@npm:22.8.4"
dependencies:
undici-types: "npm:~6.19.8"
checksum: 10c0/f88d030480630194a9168772462ec09b2d86454f34368c46d2b7fda5dc6e14594b1576fcc5c35cc53b57a4d1e8dd2865a85ae81f34ded0d1af753a0f5d294c25
languageName: node
linkType: hard
"@types/parse-json@npm:^4.0.0": "@types/parse-json@npm:^4.0.0":
version: 4.0.2 version: 4.0.2
resolution: "@types/parse-json@npm:4.0.2" resolution: "@types/parse-json@npm:4.0.2"
@@ -1516,15 +1525,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:8.11.0": "@typescript-eslint/eslint-plugin@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/eslint-plugin@npm:8.11.0" resolution: "@typescript-eslint/eslint-plugin@npm:8.12.2"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.10.0" "@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.11.0" "@typescript-eslint/scope-manager": "npm:8.12.2"
"@typescript-eslint/type-utils": "npm:8.11.0" "@typescript-eslint/type-utils": "npm:8.12.2"
"@typescript-eslint/utils": "npm:8.11.0" "@typescript-eslint/utils": "npm:8.12.2"
"@typescript-eslint/visitor-keys": "npm:8.11.0" "@typescript-eslint/visitor-keys": "npm:8.12.2"
graphemer: "npm:^1.4.0" graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1" ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0" natural-compare: "npm:^1.4.0"
@@ -1535,66 +1544,66 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/be509f7bb0c0c596801059b06995a81a1c326cc6ac31d96a32f7b6b7d7b495f9bad4dc442aa6e923d22515e62c668d3c14695c68bd6e0be1d4bf72158b7fd2d6 checksum: 10c0/0f9c0982bc652c723923d22944254cb7c96fbb972e375f4eb1b031a512e67abc83a335f4ba677cff2275e83a7a61d3937473a3939ae4aa9a5b52a5313f02fb75
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:8.11.0": "@typescript-eslint/parser@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/parser@npm:8.11.0" resolution: "@typescript-eslint/parser@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:8.11.0" "@typescript-eslint/scope-manager": "npm:8.12.2"
"@typescript-eslint/types": "npm:8.11.0" "@typescript-eslint/types": "npm:8.12.2"
"@typescript-eslint/typescript-estree": "npm:8.11.0" "@typescript-eslint/typescript-estree": "npm:8.12.2"
"@typescript-eslint/visitor-keys": "npm:8.11.0" "@typescript-eslint/visitor-keys": "npm:8.12.2"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/e83f239fec60697083e5dcb1c8948340e783ea6e043fe9a65d557faef8882963b09d69aacd736eb8ab18a768769a7bbfc3de0f1251d4bba080613541acb0741c checksum: 10c0/0d41f02e91045c5dca70e347731c74a4162ab567bedf3f7f69a2c3f152f629f2d1f96cf09188270c7df48e8a2d6193ccf177e636dcaa3e58cb85ba453c343d24
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:8.11.0": "@typescript-eslint/scope-manager@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/scope-manager@npm:8.11.0" resolution: "@typescript-eslint/scope-manager@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.11.0" "@typescript-eslint/types": "npm:8.12.2"
"@typescript-eslint/visitor-keys": "npm:8.11.0" "@typescript-eslint/visitor-keys": "npm:8.12.2"
checksum: 10c0/0910da62d8ae261711dd9f89d5c7d8e96ff13c50054436256e5a661309229cb49e3b8189c9468d36b6c4d3f7cddd121519ea78f9b18c9b869a808834b079b2ea checksum: 10c0/e953838e9c1a55cc23c8ec5ecd0a7d447020ac8a1171bed248b6751fc3ec3910a5dad3497a63b660106844a4abeb17265b9a49ce2d0e29264213579b6cda20ab
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:8.11.0": "@typescript-eslint/type-utils@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/type-utils@npm:8.11.0" resolution: "@typescript-eslint/type-utils@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:8.11.0" "@typescript-eslint/typescript-estree": "npm:8.12.2"
"@typescript-eslint/utils": "npm:8.11.0" "@typescript-eslint/utils": "npm:8.12.2"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^1.3.0"
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/b69e31c1599ceeb20c29052a4ddb33a554174a3a4c55ee37d90c9b8250af6ef978a0b9ddbeefef4e83d62c4caea1bfa2d8088527f397bde69fb4ab9b360d794a checksum: 10c0/88fb254acb022a6997a7335f1d9db54112f89a6f090afbf7c0ca52a6b70885391db7d6d40cf016084425f2899aaff49dac31e9df8cff12aae90c9c051eab69ff
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:8.11.0": "@typescript-eslint/types@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/types@npm:8.11.0" resolution: "@typescript-eslint/types@npm:8.12.2"
checksum: 10c0/5ccdd3eeee077a6fc8e7f4bc0e0cbc9327b1205a845253ec5c0c6c49ff915e853161df00c24a0ffb4b8ec745d3f153dd0e066400a021c844c026e31121f46699 checksum: 10c0/7fdc26b349a4f0faa9e80683d425fe7a5761a50c76f2fad6ebdf30f1ef75443c06c158e17b2a529f70fc6d56560a130b4e59038b6e2f583c8cb54c1d0ab9cf73
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:8.11.0": "@typescript-eslint/typescript-estree@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/typescript-estree@npm:8.11.0" resolution: "@typescript-eslint/typescript-estree@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.11.0" "@typescript-eslint/types": "npm:8.12.2"
"@typescript-eslint/visitor-keys": "npm:8.11.0" "@typescript-eslint/visitor-keys": "npm:8.12.2"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
fast-glob: "npm:^3.3.2" fast-glob: "npm:^3.3.2"
is-glob: "npm:^4.0.3" is-glob: "npm:^4.0.3"
@@ -1604,31 +1613,31 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/b629ad3cd32b005d5c1d67c36958a418f8672efebea869399834f4f201ebf90b942165eebb5c9d9799dcabdc2cc26e5fabb00629f76b158847f42e1a491a75a6 checksum: 10c0/133db215be60c64bf9fb20d678aaf258b31d752380492474228946ba04f540210b371217414f56c37e61b04d77a451085c421ac9a19aca818b07ac67b7139b86
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:8.11.0": "@typescript-eslint/utils@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/utils@npm:8.11.0" resolution: "@typescript-eslint/utils@npm:8.12.2"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0" "@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.11.0" "@typescript-eslint/scope-manager": "npm:8.12.2"
"@typescript-eslint/types": "npm:8.11.0" "@typescript-eslint/types": "npm:8.12.2"
"@typescript-eslint/typescript-estree": "npm:8.11.0" "@typescript-eslint/typescript-estree": "npm:8.12.2"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
checksum: 10c0/bb5bcc8d928a55b22298e76f834ea6a9fe125a9ffeb6ac23bee0258b3ed32f41e281888a3d0be226a05e1011bb3b70e42a71a40366acdefea6779131c46bc522 checksum: 10c0/c050637aca88e8a5a09c2cee20d667ee3dbf1efa5488a11eca14069b320447419db3f8a42b7d3598d9acaad3a109cb6017d0e32d782255641721a41e95b2be2f
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:8.11.0": "@typescript-eslint/visitor-keys@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "@typescript-eslint/visitor-keys@npm:8.11.0" resolution: "@typescript-eslint/visitor-keys@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.11.0" "@typescript-eslint/types": "npm:8.12.2"
eslint-visitor-keys: "npm:^3.4.3" eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/7a5a49609fdc47e114fe59eee56393c90b122ec8e9520f90b0c5e189635ae1ccfa8e00108f641342c2c8f4637fe9d40c77927cf7c8248a3a660812cb4b7d0c08 checksum: 10c0/1f770d361bcb03ed028e5589824f6c7ba364da59fe8b982c2fed0878ad25890d80ebd6c72618ab5149317501964b7db106e20834179d4aa707a8cbffcca89d08
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1641,14 +1650,14 @@ __metadata:
"@emotion/react": "npm:^11.13.3" "@emotion/react": "npm:^11.13.3"
"@emotion/styled": "npm:^11.13.0" "@emotion/styled": "npm:^11.13.0"
"@eslint/js": "npm:^9.13.0" "@eslint/js": "npm:^9.13.0"
"@mui/icons-material": "npm:^6.1.5" "@mui/icons-material": "npm:^6.1.6"
"@mui/material": "npm:^6.1.5" "@mui/material": "npm:^6.1.6"
"@preact/compat": "npm:^18.3.1" "@preact/compat": "npm:^18.3.1"
"@preact/preset-vite": "npm:^2.9.1" "@preact/preset-vite": "npm:^2.9.1"
"@table-library/react-table-library": "npm:4.1.7" "@table-library/react-table-library": "npm:4.1.7"
"@trivago/prettier-plugin-sort-imports": "npm:^4.3.0" "@trivago/prettier-plugin-sort-imports": "npm:^4.3.0"
"@types/formidable": "npm:^3" "@types/formidable": "npm:^3"
"@types/node": "npm:^22.8.1" "@types/node": "npm:^22.8.4"
"@types/react": "npm:^18.3.12" "@types/react": "npm:^18.3.12"
"@types/react-dom": "npm:^18.3.1" "@types/react-dom": "npm:^18.3.1"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
@@ -1671,7 +1680,7 @@ __metadata:
terser: "npm:^5.36.0" terser: "npm:^5.36.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.6.3" typescript: "npm:^5.6.3"
typescript-eslint: "npm:8.11.0" typescript-eslint: "npm:8.12.2"
vite: "npm:^5.4.10" vite: "npm:^5.4.10"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^5.0.1" vite-tsconfig-paths: "npm:^5.0.1"
@@ -6721,17 +6730,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript-eslint@npm:8.11.0": "typescript-eslint@npm:8.12.2":
version: 8.11.0 version: 8.12.2
resolution: "typescript-eslint@npm:8.11.0" resolution: "typescript-eslint@npm:8.12.2"
dependencies: dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.11.0" "@typescript-eslint/eslint-plugin": "npm:8.12.2"
"@typescript-eslint/parser": "npm:8.11.0" "@typescript-eslint/parser": "npm:8.12.2"
"@typescript-eslint/utils": "npm:8.11.0" "@typescript-eslint/utils": "npm:8.12.2"
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 10c0/8f9b5916c9f47b0cbb26f142d1a266a6aaf33998ec87621252dffb56d8fe0ad01a944f8d8d837e4e6058153a1deee3557527d14fa7bf7ef80a927334529db6bd checksum: 10c0/8a80916204da1a056fa3776d7c69d3d21b9a242d8d2bea75ca32b25d86a0c0e28711fb185605024e463b311e582f693166950d6fe0f66f0969603214e190cbcc
languageName: node languageName: node
linkType: hard linkType: hard

2
lib/framework/UploadFileService.h
View File

@@ -13,7 +13,7 @@
#define UPLOAD_FILE_PATH "/rest/uploadFile" #define UPLOAD_FILE_PATH "/rest/uploadFile"
#define TEMP_FILENAME_PATH "/tmp_upload" // for uploaded json files #define TEMP_FILENAME_PATH "/pre_load.json" // for uploaded json files, handled by System::check_restore()
class UploadFileService { class UploadFileService {
public: public:

BIN
media/favicon/android-chrome-192x192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

BIN
media/favicon/android-chrome-512x512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
media/favicon/apple-touch-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
media/favicon/favicon-16x16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 505 B

BIN
media/favicon/favicon-32x32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
media/favicon/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 15 KiB

1
media/favicon/site.webmanifest Normal file
View File

@@ -0,0 +1 @@
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

934
mock-api/.yarn/releases/yarn-4.5.1.cjs vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
mock-api/.yarnrc.yml
View File

@@ -1 +1,3 @@
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.5.1.cjs

2
scripts/rename_fw.py
View File

@@ -101,7 +101,7 @@ def bin_copy(source, target, env):
# make a copy using the old 3.6.x filename format for backwards compatibility with the WebUI version check, e.g. # make a copy using the old 3.6.x filename format for backwards compatibility with the WebUI version check, e.g.
# create a EMS-ESP-<version>-ESP32_S3.bin if target is ci_s3_16M_P (16MB, PSRAM) # create a EMS-ESP-<version>-ESP32_S3.bin if target is ci_s3_16M_P (16MB, PSRAM)
# create a EMS-ESP-<version>-ESP32.bin if target is ci_s_4M (4MB, no PSRAM) # create a EMS-ESP-<version>-ESP32.bin if target is ci_s_4M (4MB, no PSRAM), compatible only with S32 V1 and E32 V1.0,1.4,1.5
# #
# Note: there is a chance newer E32V2s (which use the 16MB partition table and PSRAM) are running a custom build # Note: there is a chance newer E32V2s (which use the 16MB partition table and PSRAM) are running a custom build
# of the 3.6.5 firmware as 3.6.5 was released before production of the gateway board. Updating via the WebUI will break the system and require a manual update. # of the 3.6.5 firmware as 3.6.5 was released before production of the gateway board. Updating via the WebUI will break the system and require a manual update.

1
src/system.cpp
View File

@@ -1135,6 +1135,7 @@ void System::show_system(uuid::console::Shell & shell) {
} }
// see if there is a restore of an older settings file that needs to be applied // see if there is a restore of an older settings file that needs to be applied
// note there can be only one file at a time
bool System::check_restore() { bool System::check_restore() {
bool reboot_required = false; // true if we need to reboot bool reboot_required = false; // true if we need to reboot

2
src/telegram.h
View File

@@ -133,7 +133,7 @@ class Telegram {
auto msg_size = (index - this->offset + num_bytes - 1); auto msg_size = (index - this->offset + num_bytes - 1);
if ((index < this->offset) || (msg_size >= this->message_length) || (msg_size > EMS_MAX_TELEGRAM_MESSAGE_LENGTH)) { if ((index < this->offset) || (msg_size >= this->message_length) || (msg_size > EMS_MAX_TELEGRAM_MESSAGE_LENGTH)) {
return false; return false; // TODO we should set value to a default value here
} }
Value val = value; Value val = value;