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 branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev

Browse Source
This commit is contained in:
MichaelDvP
2025-01-09 08:55:12 +01:00
parent d3d132ec45 b3be1d9351
commit 9c00af317e
6 changed files with 111 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
interface/package.json
View File

@@ -21,7 +21,7 @@
"lint": "eslint . --fix" "lint": "eslint . --fix"
}, },
"dependencies": { "dependencies": {
"@alova/adapter-xhr": "2.1.0", "@alova/adapter-xhr": "2.1.1",
"@emotion/react": "^11.14.0", "@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0", "@emotion/styled": "^11.14.0",
"@mui/icons-material": "^6.3.1", "@mui/icons-material": "^6.3.1",
@@ -38,7 +38,7 @@
"react-router": "^7.1.1", "react-router": "^7.1.1",
"react-toastify": "^11.0.2", "react-toastify": "^11.0.2",
"typesafe-i18n": "^5.26.2", "typesafe-i18n": "^5.26.2",
"typescript": "^5.7.2" "typescript": "^5.7.3"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.26.0", "@babel/core": "^7.26.0",
@@ -48,16 +48,16 @@
"@trivago/prettier-plugin-sort-imports": "^5.2.1", "@trivago/prettier-plugin-sort-imports": "^5.2.1",
"@types/formidable": "^3", "@types/formidable": "^3",
"@types/node": "^22.10.5", "@types/node": "^22.10.5",
"@types/react": "^19.0.2", "@types/react": "^19.0.3",
"@types/react-dom": "^19.0.2", "@types/react-dom": "^19.0.2",
"concurrently": "^9.1.2", "concurrently": "^9.1.2",
"eslint": "^9.17.0", "eslint": "^9.17.0",
"eslint-config-prettier": "^9.1.0", "eslint-config-prettier": "^9.1.0",
"formidable": "^3.5.2", "formidable": "^3.5.2",
"prettier": "^3.4.2", "prettier": "^3.4.2",
"rollup-plugin-visualizer": "^5.13.1", "rollup-plugin-visualizer": "^5.14.0",
"terser": "^5.37.0", "terser": "^5.37.0",
"typescript-eslint": "8.19.0", "typescript-eslint": "8.19.1",
"vite": "^6.0.7", "vite": "^6.0.7",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.4" "vite-tsconfig-paths": "^5.1.4"

180
interface/yarn.lock
View File

@@ -5,14 +5,14 @@ __metadata:
version: 8 version: 8
cacheKey: 10c0 cacheKey: 10c0
"@alova/adapter-xhr@npm:2.1.0": "@alova/adapter-xhr@npm:2.1.1":
version: 2.1.0 version: 2.1.1
resolution: "@alova/adapter-xhr@npm:2.1.0" resolution: "@alova/adapter-xhr@npm:2.1.1"
dependencies: dependencies:
"@alova/shared": "npm:1.1.2" "@alova/shared": "npm:1.1.2"
peerDependencies: peerDependencies:
alova: ^3.0.20 alova: ^3.0.20
checksum: 10c0/41cf62a5ed7fb654df8b201ce33c665950fde6b845b7c061a1b28132cfcc60b099ad20f807affb8dfbb4563439dc60b2c7c25126717137e1748cfa00436da01b checksum: 10c0/31e5ea726e7b64e3def8a507b7a03afe86331643c96af22129a1a202626b862eb3953fee9c2e29ca7b095a952e1a0e7d10fc98dd307f400e747121b582b9c776
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1443,12 +1443,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@types/react@npm:^19.0.2": "@types/react@npm:^19.0.3":
version: 19.0.2 version: 19.0.3
resolution: "@types/react@npm:19.0.2" resolution: "@types/react@npm:19.0.3"
dependencies: dependencies:
csstype: "npm:^3.0.2" csstype: "npm:^3.0.2"
checksum: 10c0/8992f39701fcf1bf893ef8f94a56196445667baf08fe4f6050a14e229a17aad3265ad3efc01595ff3b4d5d5c69da885f9aa4ff80f164a613018734efcff1eb8f checksum: 10c0/90129c45f2f09154d9409964964d0ccbac7f04d5f7fcf73fc146d33887931fbfdfd1e2947514298f94f986cc264aff8ba3201e9a4ea207d3308f20a06d47c805
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1470,115 +1470,115 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:8.19.0": "@typescript-eslint/eslint-plugin@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/eslint-plugin@npm:8.19.0" resolution: "@typescript-eslint/eslint-plugin@npm:8.19.1"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.10.0" "@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.19.0" "@typescript-eslint/scope-manager": "npm:8.19.1"
"@typescript-eslint/type-utils": "npm:8.19.0" "@typescript-eslint/type-utils": "npm:8.19.1"
"@typescript-eslint/utils": "npm:8.19.0" "@typescript-eslint/utils": "npm:8.19.1"
"@typescript-eslint/visitor-keys": "npm:8.19.0" "@typescript-eslint/visitor-keys": "npm:8.19.1"
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"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^2.0.0"
peerDependencies: peerDependencies:
"@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0 "@typescript-eslint/parser": ^8.0.0 || ^8.0.0-alpha.0
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/ceaa5063b68684b5608950b5e69f0caf1eadfc356cba82625240d6aae55f769faff599c38d35252dcb77a40d92e6fbf6d6264bc0c577d5c549da25061c3bd796 checksum: 10c0/993784b04533b13c3f3919c793cfc3a369fa61692e1a2d72de6fba27df247c275d852cdcbc4e393c310b73fce8d34d210a9b632b66f4d761a1a3b4781f8fa93f
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:8.19.0": "@typescript-eslint/parser@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/parser@npm:8.19.0" resolution: "@typescript-eslint/parser@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:8.19.0" "@typescript-eslint/scope-manager": "npm:8.19.1"
"@typescript-eslint/types": "npm:8.19.0" "@typescript-eslint/types": "npm:8.19.1"
"@typescript-eslint/typescript-estree": "npm:8.19.0" "@typescript-eslint/typescript-estree": "npm:8.19.1"
"@typescript-eslint/visitor-keys": "npm:8.19.0" "@typescript-eslint/visitor-keys": "npm:8.19.1"
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
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/064b0997963060490fc3f92c90cebc7c694f47a7657f7882ce9eb314786e0cf3e917bfccfad614d23038439d84e69a978bdc7054515b23201001dd427e524e64 checksum: 10c0/1afbd2d0a25f439943bdc94637417429574eb3889a2a1ce24bd425721713aca213808a975bb518a6616171783bc04fa973167f05fc6a96cfd88c1d1666077ad4
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:8.19.0": "@typescript-eslint/scope-manager@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/scope-manager@npm:8.19.0" resolution: "@typescript-eslint/scope-manager@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.19.0" "@typescript-eslint/types": "npm:8.19.1"
"@typescript-eslint/visitor-keys": "npm:8.19.0" "@typescript-eslint/visitor-keys": "npm:8.19.1"
checksum: 10c0/5052863d00db7ae939de27e91dc6c92df3c37a877e1ff44015ae9aa754d419b44d97d98b25fbb30a80dc58cf92606dad599e27f32b86d20c13b77ac12b4f2abc checksum: 10c0/7dca0c28ad27a0c7e26499e0f584f98efdcf34087f46aadc661b36c310484b90655e83818bafd249b5a28c7094a69c54d553f6cd403869bf134f95a9148733f5
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:8.19.0": "@typescript-eslint/type-utils@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/type-utils@npm:8.19.0" resolution: "@typescript-eslint/type-utils@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:8.19.0" "@typescript-eslint/typescript-estree": "npm:8.19.1"
"@typescript-eslint/utils": "npm:8.19.0" "@typescript-eslint/utils": "npm:8.19.1"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^2.0.0"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/5a460b4d26fd68ded3567390cbac310500e94e9c69583fda3fb9930877663719e6831699bb6d85de6b940bcb7951a51ab1ef67c5fea8b76a13ea3a3783bbae28 checksum: 10c0/757592b515beec58c079c605aa648ba94d985ae48ba40460034e849c7bc2b603b1da6113e59688e284608c9d5ccaa27adf0a14fb032cb1782200c6acae51ddd2
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:8.19.0": "@typescript-eslint/types@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/types@npm:8.19.0" resolution: "@typescript-eslint/types@npm:8.19.1"
checksum: 10c0/0062e7dce5f374e293c97f1f50fe450187f6b0eaf4971c818e18ef2f6baf4e9aa4e8605fba8d8fc464a504ee1130527b71ecb39d31687c31825942b9f569d902 checksum: 10c0/e907bf096d5ed7a812a1e537a98dd881ab5d2d47e072225bfffaa218c1433115a148b27a15744db8374b46dac721617c6d13a1da255fdeb369cf193416533f6e
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:8.19.0": "@typescript-eslint/typescript-estree@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/typescript-estree@npm:8.19.0" resolution: "@typescript-eslint/typescript-estree@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.19.0" "@typescript-eslint/types": "npm:8.19.1"
"@typescript-eslint/visitor-keys": "npm:8.19.0" "@typescript-eslint/visitor-keys": "npm:8.19.1"
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"
minimatch: "npm:^9.0.4" minimatch: "npm:^9.0.4"
semver: "npm:^7.6.0" semver: "npm:^7.6.0"
ts-api-utils: "npm:^1.3.0" ts-api-utils: "npm:^2.0.0"
peerDependencies: peerDependencies:
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/ff47004588e8ff585af740b3e0bda07dc52310dbfeb2317eb4a723935740cf0c1953fc9ba57f14cf192bcfe373c46be833ba29d3303df8b501181bb852c7b822 checksum: 10c0/549d9d565a58a25fc8397a555506f2e8d29a740f5b6ed9105479e22de5aab89d9d535959034a8e9d4115adb435de09ee6987d28e8922052eea577842ddce1a7a
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:8.19.0": "@typescript-eslint/utils@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/utils@npm:8.19.0" resolution: "@typescript-eslint/utils@npm:8.19.1"
dependencies: dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0" "@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:8.19.0" "@typescript-eslint/scope-manager": "npm:8.19.1"
"@typescript-eslint/types": "npm:8.19.0" "@typescript-eslint/types": "npm:8.19.1"
"@typescript-eslint/typescript-estree": "npm:8.19.0" "@typescript-eslint/typescript-estree": "npm:8.19.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/7731f7fb66d54491769ca68fd04728138ceb6b785778ad491f8e9b2147802fa0ff480e520f6ea5fb73c8484d13a2ed3e35d44635f5bf4cfbdb04c313154097a9 checksum: 10c0/f7d2fe9a2bd8cb3ae6fafe5e465882a6784b2acf81d43d194c579381b92651c2ffc0fca69d2a35eee119f539622752a0e9ec063aaec7576d5d2bfe68b441980d
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:8.19.0": "@typescript-eslint/visitor-keys@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "@typescript-eslint/visitor-keys@npm:8.19.0" resolution: "@typescript-eslint/visitor-keys@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.19.0" "@typescript-eslint/types": "npm:8.19.1"
eslint-visitor-keys: "npm:^4.2.0" eslint-visitor-keys: "npm:^4.2.0"
checksum: 10c0/a293def05018bb2259506e23cd8f14349f4386d0e51231893fbddf96ef73c219d5f9fe17b82e3c104f5c23956dbd9b87af3cff5e84b887af243139a3b4bbbe0d checksum: 10c0/117537450a099f51f3f0d39186f248ae370bdc1b7f6975dbdbffcfc89e6e1aa47c1870db790d4f778a48f2c1f6cd9c269b63867c12afaa424367c63dabee8fd0
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1586,7 +1586,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "EMS-ESP@workspace:." resolution: "EMS-ESP@workspace:."
dependencies: dependencies:
"@alova/adapter-xhr": "npm:2.1.0" "@alova/adapter-xhr": "npm:2.1.1"
"@babel/core": "npm:^7.26.0" "@babel/core": "npm:^7.26.0"
"@emotion/react": "npm:^11.14.0" "@emotion/react": "npm:^11.14.0"
"@emotion/styled": "npm:^11.14.0" "@emotion/styled": "npm:^11.14.0"
@@ -1599,7 +1599,7 @@ __metadata:
"@trivago/prettier-plugin-sort-imports": "npm:^5.2.1" "@trivago/prettier-plugin-sort-imports": "npm:^5.2.1"
"@types/formidable": "npm:^3" "@types/formidable": "npm:^3"
"@types/node": "npm:^22.10.5" "@types/node": "npm:^22.10.5"
"@types/react": "npm:^19.0.2" "@types/react": "npm:^19.0.3"
"@types/react-dom": "npm:^19.0.2" "@types/react-dom": "npm:^19.0.2"
alova: "npm:3.2.7" alova: "npm:3.2.7"
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
@@ -1616,11 +1616,11 @@ __metadata:
react-icons: "npm:^5.4.0" react-icons: "npm:^5.4.0"
react-router: "npm:^7.1.1" react-router: "npm:^7.1.1"
react-toastify: "npm:^11.0.2" react-toastify: "npm:^11.0.2"
rollup-plugin-visualizer: "npm:^5.13.1" rollup-plugin-visualizer: "npm:^5.14.0"
terser: "npm:^5.37.0" terser: "npm:^5.37.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.7.2" typescript: "npm:^5.7.3"
typescript-eslint: "npm:8.19.0" typescript-eslint: "npm:8.19.1"
vite: "npm:^6.0.7" vite: "npm:^6.0.7"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^5.1.4" vite-tsconfig-paths: "npm:^5.1.4"
@@ -5835,9 +5835,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"rollup-plugin-visualizer@npm:^5.13.1": "rollup-plugin-visualizer@npm:^5.14.0":
version: 5.13.1 version: 5.14.0
resolution: "rollup-plugin-visualizer@npm:5.13.1" resolution: "rollup-plugin-visualizer@npm:5.14.0"
dependencies: dependencies:
open: "npm:^8.4.0" open: "npm:^8.4.0"
picomatch: "npm:^4.0.2" picomatch: "npm:^4.0.2"
@@ -5853,7 +5853,7 @@ __metadata:
optional: true optional: true
bin: bin:
rollup-plugin-visualizer: dist/bin/cli.js rollup-plugin-visualizer: dist/bin/cli.js
checksum: 10c0/dc8377cda0e5d30bba5499a0bd725c30d814048644158c445229b89ce7c88500b5c59b11419253edbe334fcb540bfede16e0f049ce6cfe4cf4e771c07d361f77 checksum: 10c0/ec6ca9ed125bce9994ba49a340bda730661d8e8dc5c5dc014dc757185182e1eda49c6708f990cb059095e71a3741a5248f1e6ba0ced7056020692888e06b1ddf
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6567,12 +6567,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"ts-api-utils@npm:^1.3.0": "ts-api-utils@npm:^2.0.0":
version: 1.4.3 version: 2.0.0
resolution: "ts-api-utils@npm:1.4.3" resolution: "ts-api-utils@npm:2.0.0"
peerDependencies: peerDependencies:
typescript: ">=4.2.0" typescript: ">=4.8.4"
checksum: 10c0/e65dc6e7e8141140c23e1dc94984bf995d4f6801919c71d6dc27cf0cd51b100a91ffcfe5217626193e5bea9d46831e8586febdc7e172df3f1091a7384299e23a checksum: 10c0/6165e29a5b75bd0218e3cb0f9ee31aa893dbd819c2e46dbb086c841121eb0436ed47c2c18a20cb3463d74fd1fb5af62e2604ba5971cc48e5b38ebbdc56746dfc
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6640,37 +6640,37 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript-eslint@npm:8.19.0": "typescript-eslint@npm:8.19.1":
version: 8.19.0 version: 8.19.1
resolution: "typescript-eslint@npm:8.19.0" resolution: "typescript-eslint@npm:8.19.1"
dependencies: dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.19.0" "@typescript-eslint/eslint-plugin": "npm:8.19.1"
"@typescript-eslint/parser": "npm:8.19.0" "@typescript-eslint/parser": "npm:8.19.1"
"@typescript-eslint/utils": "npm:8.19.0" "@typescript-eslint/utils": "npm:8.19.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.8.0" typescript: ">=4.8.4 <5.8.0"
checksum: 10c0/87da630f50025b3ae943eac521809fef41ba4013b5c4206865c115b728684caa7b4c36ee561dd95af7eb4dc18ec1265b165b49d2db54e3d8fba0152bcb6c82f8 checksum: 10c0/59cdb590a0b38bfca1634c421c1acd2d1bfc8a7325af8fb1332421103dd98d454d349d4f82175088cf06216c1540dc1a73d1dca44cff16dd1d08f969feeb0c0b
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@npm:^5.7.2": "typescript@npm:^5.7.3":
version: 5.7.2 version: 5.7.3
resolution: "typescript@npm:5.7.2" resolution: "typescript@npm:5.7.3"
bin: bin:
tsc: bin/tsc tsc: bin/tsc
tsserver: bin/tsserver tsserver: bin/tsserver
checksum: 10c0/a873118b5201b2ef332127ef5c63fb9d9c155e6fdbe211cbd9d8e65877283797cca76546bad742eea36ed7efbe3424a30376818f79c7318512064e8625d61622 checksum: 10c0/b7580d716cf1824736cc6e628ab4cd8b51877408ba2be0869d2866da35ef8366dd6ae9eb9d0851470a39be17cbd61df1126f9e211d8799d764ea7431d5435afa
languageName: node languageName: node
linkType: hard linkType: hard
"typescript@patch:typescript@npm%3A^5.7.2#optional!builtin<compat/typescript>": "typescript@patch:typescript@npm%3A^5.7.3#optional!builtin<compat/typescript>":
version: 5.7.2 version: 5.7.3
resolution: "typescript@patch:typescript@npm%3A5.7.2#optional!builtin<compat/typescript>::version=5.7.2&hash=5786d5" resolution: "typescript@patch:typescript@npm%3A5.7.3#optional!builtin<compat/typescript>::version=5.7.3&hash=5786d5"
bin: bin:
tsc: bin/tsc tsc: bin/tsc
tsserver: bin/tsserver tsserver: bin/tsserver
checksum: 10c0/f3b8082c9d1d1629a215245c9087df56cb784f9fb6f27b5d55577a20e68afe2a889c040aacff6d27e35be165ecf9dca66e694c42eb9a50b3b2c451b36b5675cb checksum: 10c0/6fd7e0ed3bf23a81246878c613423730c40e8bdbfec4c6e4d7bf1b847cbb39076e56ad5f50aa9d7ebd89877999abaee216002d3f2818885e41c907caaa192cc4
languageName: node languageName: node
linkType: hard linkType: hard

12
platformio.ini
View File

@@ -96,8 +96,8 @@ platform = espressif32@6.9.0 ; Arduino Core 2.0.18 / IDF 4.4.8
framework = arduino framework = arduino
board_build.partitions = partitions/esp32_partition_4M.csv board_build.partitions = partitions/esp32_partition_4M.csv
board_upload.flash_size = 4MB board_upload.flash_size = 4MB
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8 platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.12.30/platform-espressif32.zip ; Arduino Core 3.1.0.241206 based on IDF 5.3.2 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.12.30/platform-espressif32.zip ; Arduino Core 3.1.0.241206 based on IDF 5.3.2
; use Tasmota's library for 16MB Flash variants. ; use Tasmota's library for 16MB Flash variants.
; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap ; Removes libs (like mbedtsl, so no WiFi_secure.h) to increase available heap
@@ -105,8 +105,8 @@ platform = https://github.com/tasmota/platform-espressif32/releases/download/202
framework = arduino framework = arduino
board_build.partitions = partitions/esp32_partition_16M.csv board_build.partitions = partitions/esp32_partition_16M.csv
board_upload.flash_size = 16MB board_upload.flash_size = 16MB
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8 platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.00/platform-espressif32.zip ; Arduino Core 2.0.18 with IPv6 support, based on IDF 4.4.8
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.12.30/platform-espressif32.zip ; Arduino Core 3.1.0.241206 based on IDF 5.3.2 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.12.30/platform-espressif32.zip ; Arduino Core 3.1.0.241206 based on IDF 5.3.2
[env] [env]
build_flags = build_flags =
@@ -123,8 +123,8 @@ build_type = release
board_build.filesystem = littlefs board_build.filesystem = littlefs
lib_deps = lib_deps =
bblanchon/ArduinoJson @ 7.3.0 bblanchon/ArduinoJson @ 7.3.0
mathieucarbou/AsyncTCP @ 3.3.1 mathieucarbou/AsyncTCP @ 3.3.2
mathieucarbou/ESPAsyncWebServer @ 3.4.5 mathieucarbou/ESPAsyncWebServer @ 3.5.0
https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.4 https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.4
; ;

4
src/core/system.cpp
View File

@@ -2041,13 +2041,13 @@ bool System::uploadFirmwareURL(const char * url) {
HTTPClient http; HTTPClient http;
http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); // important for GitHub 302's http.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS); // important for GitHub 302's
http.setTimeout(8000); http.setTimeout(8000);
http.useHTTP10(true); // use HTTP/1.0 for update since the update handler not support any transfer Encoding http.useHTTP10(true); // use HTTP/1.0 for update since the update handler does not support any transfer Encoding
http.begin(saved_url); http.begin(saved_url);
// start a connection, returns -1 if fails // start a connection, returns -1 if fails
int httpCode = http.GET(); int httpCode = http.GET();
if (httpCode != HTTP_CODE_OK) { if (httpCode != HTTP_CODE_OK) {
LOG_ERROR("Firmware upload failed - HTTP code %d", httpCode); LOG_ERROR("Firmware upload failed. URL %s, HTTP code %d", saved_url.c_str(), httpCode);
return false; // error return false; // error
} }

14
src/test/test.cpp
View File

@@ -424,10 +424,12 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
if (command == "upload") { if (command == "upload") {
// S3 has 16MB flash // S3 has 16MB flash
// EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_0-dev_32-ESP32S3-16MB+.bin"); // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_0-dev_32-ESP32S3-16MB+.bin"); // S3
// Test for 4MB Tasmota builds // Test for 4MB Tasmota builds
EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_0-dev_32-ESP32-16MB.bin"); // EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-4MB.bin"); // S32
EMSESP::system_.uploadFirmwareURL("https://github.com/emsesp/EMS-ESP32/releases/download/latest/EMS-ESP-3_7_2-dev_8-ESP32-16MB.bin"); // E32
ok = true; ok = true;
} }
#endif #endif
@@ -2369,7 +2371,7 @@ void Test::add_device(uint8_t device_id, uint8_t product_id) {
#ifndef EMSESP_STANDALONE #ifndef EMSESP_STANDALONE
void Test::listDir(fs::FS & fs, const char * dirname, uint8_t levels) { void Test::listDir(fs::FS & fs, const char * dirname, uint8_t levels) {
Serial.println(); Serial.println();
Serial.printf("Listing directory: %s\r\n", dirname); Serial.printf("%s\r\n", dirname);
File root = fs.open(dirname); File root = fs.open(dirname);
if (!root) { if (!root) {
@@ -2384,12 +2386,11 @@ void Test::listDir(fs::FS & fs, const char * dirname, uint8_t levels) {
File file = root.openNextFile(); File file = root.openNextFile();
while (file) { while (file) {
if (file.isDirectory()) { if (file.isDirectory()) {
Serial.print(" DIR: "); Serial.print(file.name());
Serial.println(file.name()); Serial.println("/");
if (levels) { if (levels) {
// prefix a / to the name to make it a full path // prefix a / to the name to make it a full path
listDir(fs, ("/" + String(file.name())).c_str(), levels - 1); listDir(fs, ("/" + String(file.name())).c_str(), levels - 1);
// listDir(fs, file.name(), levels - 1);
} }
Serial.println(); Serial.println();
} else { } else {
@@ -2401,7 +2402,6 @@ void Test::listDir(fs::FS & fs, const char * dirname, uint8_t levels) {
} }
file = root.openNextFile(); file = root.openNextFile();
} }
Serial.println();
} }
#endif #endif
#endif #endif

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.7.2-dev.8" #define EMSESP_APP_VERSION "3.7.2-dev.9"