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

FB100 controls hc1, fixes #2510

Browse Source
This commit is contained in:
MichaelDvP
2025-04-08 17:53:06 +02:00
parent baa4f2eb39
commit b252c2f95a
5 changed files with 69 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG_LATEST.md
View File

@@ -18,6 +18,7 @@ For more details go to [docs.emsesp.org](https://docs.emsesp.org/).
- update link buttons [#2497](https://github.com/emsesp/EMS-ESP32/issues/2497) - update link buttons [#2497](https://github.com/emsesp/EMS-ESP32/issues/2497)
- refresh scheduler states [#2502](https://github.com/emsesp/EMS-ESP32/discussions/2502) - refresh scheduler states [#2502](https://github.com/emsesp/EMS-ESP32/discussions/2502)
- also rebuild HA config on mqtt connect for scheduler, custom and shower - also rebuild HA config on mqtt connect for scheduler, custom and shower
- FB100 controls the hc, not the master [#2510](https://github.com/emsesp/EMS-ESP32/issues/2510)
## Changed ## Changed

4
interface/package.json
View File

@@ -31,7 +31,7 @@
"async-validator": "^4.2.5", "async-validator": "^4.2.5",
"jwt-decode": "^4.0.0", "jwt-decode": "^4.0.0",
"mime-types": "^3.0.1", "mime-types": "^3.0.1",
"preact": "^10.26.4", "preact": "^10.26.5",
"react": "^19.1.0", "react": "^19.1.0",
"react-dom": "^19.1.0", "react-dom": "^19.1.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
@@ -57,7 +57,7 @@
"prettier": "^3.5.3", "prettier": "^3.5.3",
"rollup-plugin-visualizer": "^5.14.0", "rollup-plugin-visualizer": "^5.14.0",
"terser": "^5.39.0", "terser": "^5.39.0",
"typescript-eslint": "8.29.0", "typescript-eslint": "8.29.1",
"vite": "^6.2.5", "vite": "^6.2.5",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^5.1.4" "vite-tsconfig-paths": "^5.1.4"

126
interface/yarn.lock
View File

@@ -1492,15 +1492,15 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/eslint-plugin@npm:8.29.0": "@typescript-eslint/eslint-plugin@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/eslint-plugin@npm:8.29.0" resolution: "@typescript-eslint/eslint-plugin@npm:8.29.1"
dependencies: dependencies:
"@eslint-community/regexpp": "npm:^4.10.0" "@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:8.29.0" "@typescript-eslint/scope-manager": "npm:8.29.1"
"@typescript-eslint/type-utils": "npm:8.29.0" "@typescript-eslint/type-utils": "npm:8.29.1"
"@typescript-eslint/utils": "npm:8.29.0" "@typescript-eslint/utils": "npm:8.29.1"
"@typescript-eslint/visitor-keys": "npm:8.29.0" "@typescript-eslint/visitor-keys": "npm:8.29.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"
@@ -1509,64 +1509,64 @@ __metadata:
"@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.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/3b05a7376a0752484229369af6eb60d13cf06d2331e79c2d471cb0b963dcf5b25a31617cafdc71d74e98921091f479f3da10725b761878a89421191d23866b54 checksum: 10c0/a3ed7556edcac374cab622862f2f9adedc91ca305d6937db6869a0253d675858c296cb5413980e8404fc39737117faaf35b00c6804664b3c542bdc417502532f
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/parser@npm:8.29.0": "@typescript-eslint/parser@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/parser@npm:8.29.0" resolution: "@typescript-eslint/parser@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/scope-manager": "npm:8.29.0" "@typescript-eslint/scope-manager": "npm:8.29.1"
"@typescript-eslint/types": "npm:8.29.0" "@typescript-eslint/types": "npm:8.29.1"
"@typescript-eslint/typescript-estree": "npm:8.29.0" "@typescript-eslint/typescript-estree": "npm:8.29.1"
"@typescript-eslint/visitor-keys": "npm:8.29.0" "@typescript-eslint/visitor-keys": "npm:8.29.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.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/270b9b27e3edb54b2f98a97b7f026f95580214002a04167809b1b71233c36d1585041cdcf26f9e08f48b9eb92652f4f9c756a83dc230f48fd204a4e5e054831c checksum: 10c0/af3570ff58c42c2014e5c117bebf91120737fb139d94415ca2711844990e95252c3006ccc699871fe3f592cc1a3f4ebfdc9dd5f6cb29b6b128c2524fcf311b75
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/scope-manager@npm:8.29.0": "@typescript-eslint/scope-manager@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/scope-manager@npm:8.29.0" resolution: "@typescript-eslint/scope-manager@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.29.0" "@typescript-eslint/types": "npm:8.29.1"
"@typescript-eslint/visitor-keys": "npm:8.29.0" "@typescript-eslint/visitor-keys": "npm:8.29.1"
checksum: 10c0/330d777043a99485b51197ad24927f1276d61e61adaf710f012b3fe7db2ab67c8925c0526f801715b498e7d8fa7cef390006b6f7ae40cee89abe22e8e438de9a checksum: 10c0/8b87a04f01ebc13075e352509bca8f31c757c3220857fa473ac155f6bdf7f30fe82765d0c3d8e790f7fad394a32765bd9f716b97c08e17581d358c76086d51af
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/type-utils@npm:8.29.0": "@typescript-eslint/type-utils@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/type-utils@npm:8.29.0" resolution: "@typescript-eslint/type-utils@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/typescript-estree": "npm:8.29.0" "@typescript-eslint/typescript-estree": "npm:8.29.1"
"@typescript-eslint/utils": "npm:8.29.0" "@typescript-eslint/utils": "npm:8.29.1"
debug: "npm:^4.3.4" debug: "npm:^4.3.4"
ts-api-utils: "npm:^2.0.1" ts-api-utils: "npm:^2.0.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/f254c8d22fc29ea088d16b06e4be1756cb5ad05ccf5989e163637b9c582e5fc8c27aa7003aad6e6a8158d56d7711ea1e4e9d361702c1a18945e0e6aaff1267c5 checksum: 10c0/72cc01dbac866b0a7c7b1f637ad03ffd22f6d3617f70f06f485cf3096fddfc821fdc56de1a072cc6af70250c63698a3e5a910f67fe46eea941955b6e0da1b2bd
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/types@npm:8.29.0": "@typescript-eslint/types@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/types@npm:8.29.0" resolution: "@typescript-eslint/types@npm:8.29.1"
checksum: 10c0/fc1e3f3071102973a9cfb8ae843c51398bd74b5583b7b0edad182ea605ef85e72ceac7987513581869958b3a65303af6b3471bfba5b7be1338e8add62019c858 checksum: 10c0/bbcb9e4f38df4485092b51ac6bb62d65f321d914ab58dc0ff1eaa7787dc0b4a39e237c2617b9f2c2bcb91a343f30de523e3544f69affa1ee4287a3ef2fc10ce7
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/typescript-estree@npm:8.29.0": "@typescript-eslint/typescript-estree@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/typescript-estree@npm:8.29.0" resolution: "@typescript-eslint/typescript-estree@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.29.0" "@typescript-eslint/types": "npm:8.29.1"
"@typescript-eslint/visitor-keys": "npm:8.29.0" "@typescript-eslint/visitor-keys": "npm:8.29.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"
@@ -1575,32 +1575,32 @@ __metadata:
ts-api-utils: "npm:^2.0.1" ts-api-utils: "npm:^2.0.1"
peerDependencies: peerDependencies:
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/61dd52229a0758e0bd29f732115c16e640a2418fb25488877c74ef03cdbeb43ddc592a37094abd794ef49812f33d6f814c5b662b95ea796ed0a6c6bfc849299b checksum: 10c0/33c46c667d9262e5625d5d0064338711b342e62c5675ded6811a2cb13ee5de2f71b90e9d0be5cb338b11b1a329c376a6bbf6c3d24fa8fb457b2eefc9f3298513
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/utils@npm:8.29.0": "@typescript-eslint/utils@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/utils@npm:8.29.0" resolution: "@typescript-eslint/utils@npm:8.29.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.29.0" "@typescript-eslint/scope-manager": "npm:8.29.1"
"@typescript-eslint/types": "npm:8.29.0" "@typescript-eslint/types": "npm:8.29.1"
"@typescript-eslint/typescript-estree": "npm:8.29.0" "@typescript-eslint/typescript-estree": "npm:8.29.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/e259d7edd12946b2dc8e1aa3bbea10f66c5277f27dda71368aa2b2923487f28cd1c123681aaae22518a31c8aeabd60a5365f8a832d0f6e6efadb03745a2d8a31 checksum: 10c0/1b2704b769b0c9353cf26a320ecf9775ba51c94c7c30e2af80ca31f4cb230f319762ab06535fcb26b6963144bbeaa53233b34965907c506283861b013f5b95fc
languageName: node languageName: node
linkType: hard linkType: hard
"@typescript-eslint/visitor-keys@npm:8.29.0": "@typescript-eslint/visitor-keys@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "@typescript-eslint/visitor-keys@npm:8.29.0" resolution: "@typescript-eslint/visitor-keys@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/types": "npm:8.29.0" "@typescript-eslint/types": "npm:8.29.1"
eslint-visitor-keys: "npm:^4.2.0" eslint-visitor-keys: "npm:^4.2.0"
checksum: 10c0/7f5452b137c4edd258b2289cddf5d92687780375db33421bc4f5e2e9b0c94064c7c5ed3a7b5d96dc9c2d09ca7842b4415b3f3ed3e3f1ae3ac2e625ecb5e87efc checksum: 10c0/0c12e83c84a754161c89e594a96454799669979c7021a8936515ec574a1fa1d6e3119e0eacf502e07a0fa7254974558ea7a48901c8bfed3c46579a61b655e4f5
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1631,7 +1631,7 @@ __metadata:
formidable: "npm:^3.5.2" formidable: "npm:^3.5.2"
jwt-decode: "npm:^4.0.0" jwt-decode: "npm:^4.0.0"
mime-types: "npm:^3.0.1" mime-types: "npm:^3.0.1"
preact: "npm:^10.26.4" preact: "npm:^10.26.5"
prettier: "npm:^3.5.3" prettier: "npm:^3.5.3"
react: "npm:^19.1.0" react: "npm:^19.1.0"
react-dom: "npm:^19.1.0" react-dom: "npm:^19.1.0"
@@ -1642,7 +1642,7 @@ __metadata:
terser: "npm:^5.39.0" terser: "npm:^5.39.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.8.3" typescript: "npm:^5.8.3"
typescript-eslint: "npm:8.29.0" typescript-eslint: "npm:8.29.1"
vite: "npm:^6.2.5" vite: "npm:^6.2.5"
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"
@@ -5471,10 +5471,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"preact@npm:^10.26.4": "preact@npm:^10.26.5":
version: 10.26.4 version: 10.26.5
resolution: "preact@npm:10.26.4" resolution: "preact@npm:10.26.5"
checksum: 10c0/8abf64ec6f9773f0c4fb3746b7caa3d83e2de4d464928e7f64fc779c96ef9e135d23c1ade8d0923c9191f6d203d9f22bb92d8a50dc0f4f310073dfaa51a56922 checksum: 10c0/542a924009489c21b24e9588a5580dac03239a60951d10e6ad1207db66c8e719e1d46a38af6577c8f324b238fbe2aa92e0ffc04d3a71dbe182f56426c8abe632
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6678,17 +6678,17 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"typescript-eslint@npm:8.29.0": "typescript-eslint@npm:8.29.1":
version: 8.29.0 version: 8.29.1
resolution: "typescript-eslint@npm:8.29.0" resolution: "typescript-eslint@npm:8.29.1"
dependencies: dependencies:
"@typescript-eslint/eslint-plugin": "npm:8.29.0" "@typescript-eslint/eslint-plugin": "npm:8.29.1"
"@typescript-eslint/parser": "npm:8.29.0" "@typescript-eslint/parser": "npm:8.29.1"
"@typescript-eslint/utils": "npm:8.29.0" "@typescript-eslint/utils": "npm:8.29.1"
peerDependencies: peerDependencies:
eslint: ^8.57.0 || ^9.0.0 eslint: ^8.57.0 || ^9.0.0
typescript: ">=4.8.4 <5.9.0" typescript: ">=4.8.4 <5.9.0"
checksum: 10c0/1438b80fc875acc65acc842dc870070be31d6a30f756a6d9985fadd063f4f568e74a83bac7aaf94d2320e434df3c033a6e2ab7258b1429cae2aa7c4b16fb5088 checksum: 10c0/31319c891d224ec8d7cf96ad7e6c84480b3d17d4c46c5beccca06fc7891f41eabd5593e44867e69dbfb79459f5545c2cc2e985c950bdd7b4e7c3bb1ec8941030
languageName: node languageName: node
linkType: hard linkType: hard

4
src/devices/thermostat.cpp
View File

@@ -201,8 +201,8 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
} else if (model == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) { } else if (model == EMSdevice::EMS_DEVICE_FLAG_JUNKERS) {
if (device_id >= 0x18 && device_id <= 0x1B) { // remote hc1-hc4 if (device_id >= 0x18 && device_id <= 0x1B) { // remote hc1-hc4
register_telegram_type(0x123, "JunkersRemote", false, MAKE_PF_CB(process_JunkersRemoteMonitor)); register_telegram_type(0x123, "JunkersRemote", false, MAKE_PF_CB(process_JunkersRemoteMonitor));
register_device_values(); // register device values for common values (not heating circuit) // register_device_values(); // register device values for common values (not heating circuit)
return; // no values to add // return; // no values to add
} }
monitor_typeids = {0x016F, 0x0170, 0x0171, 0x0172}; monitor_typeids = {0x016F, 0x0170, 0x0171, 0x0172};

2
src/emsesp_version.h
View File

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