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 dev2

Browse Source
This commit is contained in:
MichaelDvP
2023-12-13 07:14:51 +01:00
parent 29a3e79804 ac288b794f
commit a0e1894262
12 changed files with 147 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -18,6 +18,7 @@
- exhaust temperature for some boilers - exhaust temperature for some boilers
- add back boil2hyst [#1477](https://github.com/emsesp/EMS-ESP32/issues/1477) - add back boil2hyst [#1477](https://github.com/emsesp/EMS-ESP32/issues/1477)
- subscribed MQTT topics not detecting changes by EMS-ESP [#1494](https://github.com/emsesp/EMS-ESP32/issues/1494)
## Changed ## Changed

10
interface/package.json
View File

@@ -24,8 +24,8 @@
"@babel/core": "^7.23.6", "@babel/core": "^7.23.6",
"@emotion/react": "^11.11.1", "@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0", "@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.19", "@mui/icons-material": "^5.15.0",
"@mui/material": "^5.14.20", "@mui/material": "^5.15.0",
"@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",
@@ -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.13.2", "@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.13.2", "@typescript-eslint/parser": "^6.14.0",
"concurrently": "^8.2.2", "concurrently": "^8.2.2",
"eslint": "^8.55.0", "eslint": "^8.55.0",
"eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb": "^19.0.4",
@@ -70,7 +70,7 @@
"prettier": "^3.1.1", "prettier": "^3.1.1",
"rollup-plugin-visualizer": "^5.11.0", "rollup-plugin-visualizer": "^5.11.0",
"terser": "^5.26.0", "terser": "^5.26.0",
"vite": "^5.0.7", "vite": "^5.0.8",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.2.2" "vite-tsconfig-paths": "^4.2.2"
}, },

2
interface/src/i18n/en/index.ts
View File

@@ -169,7 +169,7 @@ const en: Translation = {
HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP', HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
HELP_INFORMATION_2: 'For live community chat join our Discord server', HELP_INFORMATION_2: 'For live community chat join our Discord server',
HELP_INFORMATION_3: 'To request a feature or report a bug', HELP_INFORMATION_3: 'To request a feature or report a bug',
HELP_INFORMATION_4: 'remember to download and attach your support information for a faster response when reporting an issue', HELP_INFORMATION_4: 'Remember to download and attach your support information for a faster response when reporting an issue',
HELP_INFORMATION_5: 'EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!', HELP_INFORMATION_5: 'EMS-ESP is a free and open-source project. Please support its future development by giving it a star on Github!',
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',

2
interface/src/i18n/fr/index.ts
View File

@@ -169,7 +169,7 @@ const fr: Translation = {
HELP_INFORMATION_1: 'Visitez le wiki en ligne pour obtenir des instructions sur la façon de configurer EMS-ESP.', HELP_INFORMATION_1: 'Visitez le wiki en ligne pour obtenir des instructions sur la façon de configurer EMS-ESP.',
HELP_INFORMATION_2: 'Pour une discussion en direct avec la communauté, rejoignez notre serveur Discord', HELP_INFORMATION_2: 'Pour une discussion en direct avec la communauté, rejoignez notre serveur Discord',
HELP_INFORMATION_3: 'Pour demander une fonctionnalité ou signaler un problème', HELP_INFORMATION_3: 'Pour demander une fonctionnalité ou signaler un problème',
HELP_INFORMATION_4: 'n\'oubliez pas de télécharger et de joindre les informations relatives à votre système pour obtenir une réponse plus rapide lorsque vous signalez un problème', HELP_INFORMATION_4: 'N\'oubliez pas de télécharger et de joindre les informations relatives à votre système pour obtenir une réponse plus rapide lorsque vous signalez un problème',
HELP_INFORMATION_5: 'EMS-ESP est un projet libre et open-source. Merci de soutenir son développement futur en lui donnant une étoile sur Github !', HELP_INFORMATION_5: 'EMS-ESP est un projet libre et open-source. Merci de soutenir son développement futur en lui donnant une étoile sur Github !',
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',

2
interface/src/i18n/it/index.ts
View File

@@ -171,7 +171,7 @@ const it: Translation = {
HELP_INFORMATION_1: 'Visita il wiki online per ottenere istruzioni su come configurare EMS-ESP', HELP_INFORMATION_1: 'Visita il wiki online per ottenere istruzioni su come configurare EMS-ESP',
HELP_INFORMATION_2: 'Per la chat della community dal vivo unisciti al nostro server Discord', HELP_INFORMATION_2: 'Per la chat della community dal vivo unisciti al nostro server Discord',
HELP_INFORMATION_3: 'Per richiedere una funzionalità o segnalare un errore', HELP_INFORMATION_3: 'Per richiedere una funzionalità o segnalare un errore',
HELP_INFORMATION_4: 'ricordati di scaricare e allegare le informazioni del tuo sistema per una risposta più rapida quando segnali un problema', HELP_INFORMATION_4: 'Ricordati di scaricare e allegare le informazioni del tuo sistema per una risposta più rapida quando segnali un problema',
HELP_INFORMATION_5: 'EMS-ESP è un progetto gratuito e open-source. Supporta il suo sviluppo futuro assegnandogli una stella su Github!', HELP_INFORMATION_5: 'EMS-ESP è un progetto gratuito e open-source. Supporta il suo sviluppo futuro assegnandogli una stella su Github!',
UPLOAD: 'Carica', UPLOAD: 'Carica',
DOWNLOAD: 'Scarica', DOWNLOAD: 'Scarica',

2
interface/src/i18n/nl/index.ts
View File

@@ -169,7 +169,7 @@ const nl: Translation = {
HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren', HELP_INFORMATION_1: 'Bezoek de online wiki om instructies te vinden om EMS-ESP te configureren',
HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server', HELP_INFORMATION_2: 'Voor de live community ga naar de Discord server',
HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren', HELP_INFORMATION_3: 'Om een nieuwe feature te vragen of een bug te rapporteren',
HELP_INFORMATION_4: 'zorg dat je ook je systeem details zijn toevoeged voor een sneller antwoord', HELP_INFORMATION_4: 'Zorg dat je ook je systeem details zijn toevoeged voor een sneller antwoord',
HELP_INFORMATION_5: 'EMS-ESP is een gratis en open source project. Steun ons met een Star op Github!', HELP_INFORMATION_5: 'EMS-ESP is een gratis en open source project. Steun ons met een Star op Github!',
UPLOAD: 'Upload', UPLOAD: 'Upload',
DOWNLOAD: '{{D|d|d}}ownload', DOWNLOAD: '{{D|d|d}}ownload',

2
interface/src/i18n/no/index.ts
View File

@@ -169,7 +169,7 @@ const no: Translation = {
HELP_INFORMATION_1: 'Besøk wiki for instruksjoner for å konfigurere EMS-ESP', HELP_INFORMATION_1: 'Besøk wiki for instruksjoner for å konfigurere EMS-ESP',
HELP_INFORMATION_2: 'For community-support besøk vår Discord-server', HELP_INFORMATION_2: 'For community-support besøk vår Discord-server',
HELP_INFORMATION_3: 'For å be om en ny funksjon eller melde feil', HELP_INFORMATION_3: 'For å be om en ny funksjon eller melde feil',
HELP_INFORMATION_4: 'husk å laste ned og legg ved din systeminformasjon for en raskere respons når du rapporterer et problem', HELP_INFORMATION_4: 'Husk å laste ned og legg ved din systeminformasjon for en raskere respons når du rapporterer et problem',
HELP_INFORMATION_5: 'EMS-ESP er gratis og åpen kildekode. Bidra til utviklingen ved å gi oss en stjerne på GitHub!', HELP_INFORMATION_5: 'EMS-ESP er gratis og åpen kildekode. Bidra til utviklingen ved å gi oss en stjerne på GitHub!',
UPLOAD: 'Opplasning', UPLOAD: 'Opplasning',
DOWNLOAD: '{{N|n|n}}edlasting', DOWNLOAD: '{{N|n|n}}edlasting',

236
interface/yarn.lock
View File

@@ -401,12 +401,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@babel/runtime@npm:^7.23.4": "@babel/runtime@npm:^7.23.5":
version: 7.23.5 version: 7.23.6
resolution: "@babel/runtime@npm:7.23.5" resolution: "@babel/runtime@npm:7.23.6"
dependencies: dependencies:
regenerator-runtime: "npm:^0.14.0" regenerator-runtime: "npm:^0.14.0"
checksum: 0f1669f639af30a0a2948ffcefa2c61935f337b0777bd94f8d7bc66bba8e7d4499e725caeb0449540d9c6d67399b733c4e719babb43ce9a0f33095aa01b42b37 checksum: 4c4ab16f0361c59fb23956e4d0a29935f1f8a64aa8dd37876ce38355b6f4d8f0e54237aacb89c73b1532def60539ddde2d651523c8fa887b30b19a8cf0c465b0
languageName: node languageName: node
linkType: hard linkType: hard
@@ -957,14 +957,14 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/base@npm:5.0.0-beta.26": "@mui/base@npm:5.0.0-beta.27":
version: 5.0.0-beta.26 version: 5.0.0-beta.27
resolution: "@mui/base@npm:5.0.0-beta.26" resolution: "@mui/base@npm:5.0.0-beta.27"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@floating-ui/react-dom": "npm:^2.0.4" "@floating-ui/react-dom": "npm:^2.0.4"
"@mui/types": "npm:^7.2.10" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.14.20" "@mui/utils": "npm:^5.15.0"
"@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 +975,22 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: aac30be4a34e650aa8ae7eabe016e35d2a04d9c9ef52627280d75c3f04f01b02d5f10e46c3dee1d154f9342b5f76bde92ef2df04c0258be89b8de797ee1709eb checksum: 944f2a020cb6b58f5dccde55cdc25ec486b26a1f89ee18d108b555e9e8855834890664e4b67eb6e3d1961c3847cd14ec725dd6a28d7e462a26f933c5ef8472b3
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/core-downloads-tracker@npm:^5.14.20": "@mui/core-downloads-tracker@npm:^5.15.0":
version: 5.14.20 version: 5.15.0
resolution: "@mui/core-downloads-tracker@npm:5.14.20" resolution: "@mui/core-downloads-tracker@npm:5.15.0"
checksum: f3ca541452541cdb399a0b3afae3f62c30a54062a1a5014c89fbb271874f872d6a7b35304bb8765d6438490cece86599e859c94b344337759589632ad0d0d709 checksum: a7aadd4071ff715e618b8db647137579ca63cab4bf6e3acfe86a7d461f71605fc7ce44eeea5b1e789faae8546617b1f7d14c72a0c00fa3d59951b6eee42a6c5d
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/icons-material@npm:^5.14.19": "@mui/icons-material@npm:^5.15.0":
version: 5.14.19 version: 5.15.0
resolution: "@mui/icons-material@npm:5.14.19" resolution: "@mui/icons-material@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
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 +998,20 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 648a44af9a18a39062126d80268d0d4816d408d253d46f097cf8ad525e37dad8301a7727942f4908a15c432de361dabe29de0595f3771cf8acf7da311374441e checksum: 48a1c32a334bafe53723445ce29f73f920150b9421118909fbca37857f635ab802e3f49a247b7bbaf06f0d2b879deed9a9462df4dbd8d3c06cec29638c6a2d12
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/material@npm:^5.14.20": "@mui/material@npm:^5.15.0":
version: 5.14.20 version: 5.15.0
resolution: "@mui/material@npm:5.14.20" resolution: "@mui/material@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@mui/base": "npm:5.0.0-beta.26" "@mui/base": "npm:5.0.0-beta.27"
"@mui/core-downloads-tracker": "npm:^5.14.20" "@mui/core-downloads-tracker": "npm:^5.15.0"
"@mui/system": "npm:^5.14.20" "@mui/system": "npm:^5.15.0"
"@mui/types": "npm:^7.2.10" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.14.20" "@mui/utils": "npm:^5.15.0"
"@types/react-transition-group": "npm:^4.4.9" "@types/react-transition-group": "npm:^4.4.9"
clsx: "npm:^2.0.0" clsx: "npm:^2.0.0"
csstype: "npm:^3.1.2" csstype: "npm:^3.1.2"
@@ -1031,16 +1031,16 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: 37b3c253783c12768798c62ff12c9b04ab3af1269a338c9fec8a0916e95e812829eccde5e1ba1642b4821e9fe53315aa58a14a9b6440e252534aef4eca3e6e68 checksum: 2ecffcebaa854de521dad6eef7b6d19db15f4cfd17462f6db548db2485bfe2ece8c4347c16a4ba40c621cd1c5c6a823d5936c3af1baf6550883d156d41bbc027
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/private-theming@npm:^5.14.20": "@mui/private-theming@npm:^5.15.0":
version: 5.14.20 version: 5.15.0
resolution: "@mui/private-theming@npm:5.14.20" resolution: "@mui/private-theming@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@mui/utils": "npm:^5.14.20" "@mui/utils": "npm:^5.15.0"
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 +1048,15 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 7f4ceac63a298707b3a9d56e96375d6a32aeaee15a16e08d4b0e208dddca7bc0a65f6e1ab9d0b43a945d218ae9b7614c5aefd431c8c81149b0195f7fac01ea52 checksum: f02eee2c460a3d9ea288743dcd2fcb3d1e254c9428b9aae1d7cc37295d6ea530f6641071636922bbf8f36b8ee150330a71d643ca88420b18431d769c3a3cf413
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/styled-engine@npm:^5.14.19": "@mui/styled-engine@npm:^5.15.0":
version: 5.14.19 version: 5.15.0
resolution: "@mui/styled-engine@npm:5.14.19" resolution: "@mui/styled-engine@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@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 +1069,19 @@ __metadata:
optional: true optional: true
"@emotion/styled": "@emotion/styled":
optional: true optional: true
checksum: 210da24bcb47c8b911b0f4174ecd77ced2aa5eba442861b474fe575384d736edc9553b707be35a086ae514503c26dbfa5541a352db65fa7de970c6251365214b checksum: 02de548366cf52461ba253fad81af00e1eeca828537e9647410583316a7585900467daa62258ec7e4f49143f6c7a114efc987a44b574b83d3e158243606eeaa1
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/system@npm:^5.14.20": "@mui/system@npm:^5.15.0":
version: 5.14.20 version: 5.15.0
resolution: "@mui/system@npm:5.14.20" resolution: "@mui/system@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@mui/private-theming": "npm:^5.14.20" "@mui/private-theming": "npm:^5.15.0"
"@mui/styled-engine": "npm:^5.14.19" "@mui/styled-engine": "npm:^5.15.0"
"@mui/types": "npm:^7.2.10" "@mui/types": "npm:^7.2.11"
"@mui/utils": "npm:^5.14.20" "@mui/utils": "npm:^5.15.0"
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,27 +1097,27 @@ __metadata:
optional: true optional: true
"@types/react": "@types/react":
optional: true optional: true
checksum: faaf3c09868e77e2b8870ff1d04c9811056807677aee9aff6b0ed0d89c78bf3beccfc2bf96863aad55d2c5f1dede1ed4296183cbd166ea0b3060654ea34203a1 checksum: eeaaf11f5b63e53bec8e8bdc4eff187cea13d2ec0dbb0b2b3d1a392b264cc31f3b5e6cba69835aa8b02da29ec7e2c3522946b2c738321a14cd3e995f04c45312
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/types@npm:^7.2.10": "@mui/types@npm:^7.2.11":
version: 7.2.10 version: 7.2.11
resolution: "@mui/types@npm:7.2.10" resolution: "@mui/types@npm:7.2.11"
peerDependencies: peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0 "@types/react": ^17.0.0 || ^18.0.0
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 83067cd1da9c79f7ee82f171ba718435d8aa12c6e72c4d5d24bee9e310416ccb91cb86cb0502f463e683e9707d90befc5112509fe7af54cacd39f8556b150f9b checksum: 57d47e455aeef066c38260ddededbb41b3a3830acc013a597e8434cb5291fc4fc85e76cf354c6d5ecee3894bb13c7723423b58e753485d7e6d06ca54f7d76cf7
languageName: node languageName: node
linkType: hard linkType: hard
"@mui/utils@npm:^5.14.20": "@mui/utils@npm:^5.15.0":
version: 5.14.20 version: 5.15.0
resolution: "@mui/utils@npm:5.14.20" resolution: "@mui/utils@npm:5.15.0"
dependencies: dependencies:
"@babel/runtime": "npm:^7.23.4" "@babel/runtime": "npm:^7.23.5"
"@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 +1127,7 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
"@types/react": "@types/react":
optional: true optional: true
checksum: 10fcbaef04c34ec45215b7c29f5fda918c37fa05c3d5944c332c309496b6861a0924a0fdbcd078f8849f149105e163c87bcba72fd6665da6d6122017bc208141 checksum: 241ce42bc2f18df46f2adbbac640f16a64afd55a7829b10ef944d6648d45223ecad825ee56a44db29f6c387384e3977e30a966ea4425bda667e92989dd218b0a
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1676,15 +1676,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:^6.13.2": "@typescript-eslint/eslint-plugin@npm:^6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/eslint-plugin@npm:6.13.2" resolution: "@typescript-eslint/eslint-plugin@npm:6.14.0"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.5.1" "@eslint-community/regexpp": "npm:^4.5.1"
"@typescript-eslint/scope-manager": "npm:6.13.2" "@typescript-eslint/scope-manager": "npm:6.14.0"
"@typescript-eslint/type-utils": "npm:6.13.2" "@typescript-eslint/type-utils": "npm:6.14.0"
"@typescript-eslint/utils": "npm:6.13.2" "@typescript-eslint/utils": "npm:6.14.0"
"@typescript-eslint/visitor-keys": "npm:6.13.2" "@typescript-eslint/visitor-keys": "npm:6.14.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 +1697,44 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: e6665fc5de0ae2b7ada9150d3d119157521a04208b8da385a4c39538b9471871efe6eef272dbcee4c76f599e09453b6f7317f3b3b80d89291f6b2ace4125c51b checksum: d420277bed0104713fb4a3c2e0fed32b300919708db3f2e3d13bc83e80a9aec181bfc4e1e6012c65408c318f3ac113926fc77e6667d7657e34fa0d5a2c21ee32
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:^6.13.2": "@typescript-eslint/parser@npm:^6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/parser@npm:6.13.2" resolution: "@typescript-eslint/parser@npm:6.14.0"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:6.13.2" "@typescript-eslint/scope-manager": "npm:6.14.0"
"@typescript-eslint/types": "npm:6.13.2" "@typescript-eslint/types": "npm:6.14.0"
"@typescript-eslint/typescript-estree": "npm:6.13.2" "@typescript-eslint/typescript-estree": "npm:6.14.0"
"@typescript-eslint/visitor-keys": "npm:6.13.2" "@typescript-eslint/visitor-keys": "npm:6.14.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: a2b32d2ad1aa12ce31790e80e059fd5b0699265541f3799b58f2e5c8b40f2e21ac7010519802bc406f4b74c14a1f52081570fa6119b949f68392d0968628b3b8 checksum: 34f46aa8aaadb0d0ecb7d791a8436fcf44ec04af33ee9d198bcf6f7ca3927d8caa79d4756e0c4ef0d50979d895df0b8f1a2473fc83104423c96856e9d56047f3
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:6.13.2": "@typescript-eslint/scope-manager@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/scope-manager@npm:6.13.2" resolution: "@typescript-eslint/scope-manager@npm:6.14.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.13.2" "@typescript-eslint/types": "npm:6.14.0"
"@typescript-eslint/visitor-keys": "npm:6.13.2" "@typescript-eslint/visitor-keys": "npm:6.14.0"
checksum: a6505cc73e90dfed3b9b03816213610f05be58548f468ce24c05ce49a3c6d029ef02233db51cff3b780aa8d040a0c7b3268ea28244c704932c9ee6ef82088509 checksum: fbe945169fe092df5953a54a552a9e8d9dc3dc158a39cd99de7f1843a169c82d3ba59e314b7d0f5b8110dbbe8c37c9e62dc2dda91a31536fe054221d5d8972c3
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:6.13.2": "@typescript-eslint/type-utils@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/type-utils@npm:6.13.2" resolution: "@typescript-eslint/type-utils@npm:6.14.0"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:6.13.2" "@typescript-eslint/typescript-estree": "npm:6.14.0"
"@typescript-eslint/utils": "npm:6.13.2" "@typescript-eslint/utils": "npm:6.14.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,23 +1742,23 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: c8de5ab94295980a378e4f22dd51dedb3838761969ad1a355386a801c9bc332837651747cdc2edf7f399c88d0bbd787d2233d09e14e4e2849fb01a57bd0cab00 checksum: 52c2a380d694f629ed2d37ce9decc5d8f6d276b030dcb8ee2d0a21b667d789e0d50c8a4d06fa60a053cbcc162b50c3708260f569ccd765609f17499d5294c19d
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:6.13.2": "@typescript-eslint/types@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/types@npm:6.13.2" resolution: "@typescript-eslint/types@npm:6.14.0"
checksum: 3ed2622468b2c61bff0828a3675357b498360bada85740dd72e4ec3c80ee112bce8808d7688aa0104b9d0a655a30e2deb0fee69468474c7e046fc9285f549fe6 checksum: bcb32d69ac4a570634e37a3f149b7653a85334ac7b1d736961b627647ceff74797c4ac30b1405c508ede9462fad53b0b4442dbdf21877bf91263390c6e426e95
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:6.13.2": "@typescript-eslint/typescript-estree@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/typescript-estree@npm:6.13.2" resolution: "@typescript-eslint/typescript-estree@npm:6.14.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.13.2" "@typescript-eslint/types": "npm:6.14.0"
"@typescript-eslint/visitor-keys": "npm:6.13.2" "@typescript-eslint/visitor-keys": "npm:6.14.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"
@@ -1767,34 +1767,34 @@ __metadata:
peerDependenciesMeta: peerDependenciesMeta:
typescript: typescript:
optional: true optional: true
checksum: 8fa1344228858fa8171a9660e11eb0d5ed88de2ada343bce4a02a957724ccbeb9b67da1083eada29247f444aeba6908a4145d1758b528d320928abbb4e48dca7 checksum: 870f00e81de428c0afae3f753c04229170aeec76d62dcded0e22cff1c733fe60a350cf68571c889f87ea7a6008b73f7c62a079e91ab056d79aa2b9803a5b7150
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:6.13.2": "@typescript-eslint/utils@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/utils@npm:6.13.2" resolution: "@typescript-eslint/utils@npm:6.14.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.13.2" "@typescript-eslint/scope-manager": "npm:6.14.0"
"@typescript-eslint/types": "npm:6.13.2" "@typescript-eslint/types": "npm:6.14.0"
"@typescript-eslint/typescript-estree": "npm:6.13.2" "@typescript-eslint/typescript-estree": "npm:6.14.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: 934282b612e5f78423bc375122258c5aec65fcdf9c25fd0521e3984686d1e5b950500f093c5f1c21a267be164bc7025d8f629dcfaa60573ad98c6e3861092076 checksum: fec7338edc31d89d5413ec49ce690e05741511ba1ba2a8c59ce14321f5026e73e0584dc9f35645ab4100561bcf8ecef8a08c042388743db53fe73f047132a150
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:6.13.2": "@typescript-eslint/visitor-keys@npm:6.14.0":
version: 6.13.2 version: 6.14.0
resolution: "@typescript-eslint/visitor-keys@npm:6.13.2" resolution: "@typescript-eslint/visitor-keys@npm:6.14.0"
dependencies: dependencies:
"@typescript-eslint/types": "npm:6.13.2" "@typescript-eslint/types": "npm:6.14.0"
eslint-visitor-keys: "npm:^3.4.1" eslint-visitor-keys: "npm:^3.4.1"
checksum: eb6f3a3fa4dae6003533eac41bd2a8181a0353f352640e92b619e353b4bd5a5cd4c076018cbdf4b1ba45b826be0c1d15293d87e956fc9a8aa2fb8d8aa04a7c98 checksum: 404f87a121b4375b13e59ffc11ac2fe3c8e40025d0ef5cd6738ab7b3648ce1d41378414b1130ee68e0b454d7e6ec1937540799cdaa4ea572e2447b04d737ee44
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1813,8 +1813,8 @@ __metadata:
"@babel/core": "npm:^7.23.6" "@babel/core": "npm:^7.23.6"
"@emotion/react": "npm:^11.11.1" "@emotion/react": "npm:^11.11.1"
"@emotion/styled": "npm:^11.11.0" "@emotion/styled": "npm:^11.11.0"
"@mui/icons-material": "npm:^5.14.19" "@mui/icons-material": "npm:^5.15.0"
"@mui/material": "npm:^5.14.20" "@mui/material": "npm:^5.15.0"
"@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,8 +1824,8 @@ __metadata:
"@types/react": "npm:^18.2.43" "@types/react": "npm:^18.2.43"
"@types/react-dom": "npm:^18.2.17" "@types/react-dom": "npm:^18.2.17"
"@types/react-router-dom": "npm:^5.3.3" "@types/react-router-dom": "npm:^5.3.3"
"@typescript-eslint/eslint-plugin": "npm:^6.13.2" "@typescript-eslint/eslint-plugin": "npm:^6.14.0"
"@typescript-eslint/parser": "npm:^6.13.2" "@typescript-eslint/parser": "npm:^6.14.0"
alova: "npm:^2.16.0" alova: "npm:^2.16.0"
async-validator: "npm:^4.2.5" async-validator: "npm:^4.2.5"
concurrently: "npm:^8.2.2" concurrently: "npm:^8.2.2"
@@ -1857,7 +1857,7 @@ __metadata:
terser: "npm:^5.26.0" terser: "npm:^5.26.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.3.3" typescript: "npm:^5.3.3"
vite: "npm:^5.0.7" vite: "npm:^5.0.8"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^4.2.2" vite-tsconfig-paths: "npm:^4.2.2"
languageName: unknown languageName: unknown
@@ -8676,9 +8676,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"vite@npm:^5.0.7": "vite@npm:^5.0.8":
version: 5.0.7 version: 5.0.8
resolution: "vite@npm:5.0.7" resolution: "vite@npm:5.0.8"
dependencies: dependencies:
esbuild: "npm:^0.19.3" esbuild: "npm:^0.19.3"
fsevents: "npm:~2.3.3" fsevents: "npm:~2.3.3"
@@ -8712,7 +8712,7 @@ __metadata:
optional: true optional: true
bin: bin:
vite: bin/vite.js vite: bin/vite.js
checksum: 27186e5b907484ed17a9cb803bb2127995a1659e1da9eab36bcd7bfac5d11ed41f7136d9913cc27a8c8c49c3fee5c791dee135c5d37653ddfa0153b69dc3f930 checksum: ea36e34fa45401d8e29317c3355f4d7081df09b412578bd7b6a26d44bccace9d130625f7f317a3cbc20ad2aadc5881d01d1508e8d9e36060ae44d974f505dd7e
languageName: node languageName: node
linkType: hard linkType: hard

5
lib/espMqttClient/src/MqttClient.cpp
View File

@@ -317,7 +317,8 @@ void MqttClient::_loop(MqttClient * c) {
uint16_t MqttClient::_getNextPacketId() { uint16_t MqttClient::_getNextPacketId() {
++_packetId; ++_packetId;
if (_packetId == 0) ++_packetId; if (_packetId == 0)
++_packetId;
return _packetId; return _packetId;
} }
@@ -498,7 +499,7 @@ void MqttClient::_onConnack() {
} }
void MqttClient::_onPublish() { void MqttClient::_onPublish() {
espMqttClientInternals::IncomingPacket p = _parser.getPacket(); const espMqttClientInternals::IncomingPacket & p = _parser.getPacket();
uint8_t qos = p.qos(); uint8_t qos = p.qos();
bool retain = p.retain(); bool retain = p.retain();
bool dup = p.dup(); bool dup = p.dup();

7
lib/framework/MqttSettingsService.cpp
View File

@@ -110,7 +110,12 @@ void MqttSettingsService::setWill(const char * topic) {
static_cast<espMqttClient *>(_mqttClient)->setWill(topic, 1, true, "offline"); static_cast<espMqttClient *>(_mqttClient)->setWill(topic, 1, true, "offline");
} }
void MqttSettingsService::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total) { void MqttSettingsService::onMqttMessage(const espMqttClientTypes::MessageProperties & properties,
const char * topic,
const uint8_t * payload,
size_t len,
size_t index,
size_t total) {
emsesp::EMSESP::mqtt_.on_message(topic, payload, len); emsesp::EMSESP::mqtt_.on_message(topic, payload, len);
} }

3
lib/framework/MqttSettingsService.h
View File

@@ -145,7 +145,8 @@ class MqttSettingsService : public StatefulService<MqttSettings> {
void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info); void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info);
void onMqttConnect(bool sessionPresent); void onMqttConnect(bool sessionPresent);
void onMqttDisconnect(espMqttClientTypes::DisconnectReason reason); void onMqttDisconnect(espMqttClientTypes::DisconnectReason reason);
void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total); void
onMqttMessage(const espMqttClientTypes::MessageProperties & properties, const char * topic, const uint8_t * payload, size_t len, size_t index, size_t total);
bool configureMqtt(); bool configureMqtt();
}; };