Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add forceheatingoff #1262 and header/heatblock #1317 #1319

Merged
merged 3 commits into from Oct 8, 2023
Merged

add forceheatingoff #1262 and header/heatblock #1317 #1319

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
895eddd
update packages
MichaelDvP Oct 5, 2023
5e53689
add temperatures for low loss header and heatblock, add names BC400/G…
MichaelDvP Oct 5, 2023
ac4eba5
add `forceheatingoff`
MichaelDvP Oct 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions CHANGELOG_LATEST.md
View file
Open in desktop
Expand Up @@ -7,11 +7,12 @@
## Added

- humidity for ventilation devices
- telegrams for RC100H, hc2
- telegrams for RC100H, hc2 (seen on discord)
- names for BC400, GB192i, read temperatures for low loss header and heatblock [#1317](https://github.com/emsesp/EMS-ESP32/discussions/1317)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean the GB192i.2 ? It‘s different from the GB192i


## Fixed

## Changed

- update to arduion 2.0.13 / idf 4.4.6
- update to arduino 2.0.14 / idf 4.4.6
- small changes for arduino 3.0.0 / idf 5.1 compatibility
10 changes: 5 additions & 5 deletions interface/package.json
View file
Open in desktop
Expand Up @@ -22,13 +22,13 @@
"@alova/adapter-xhr": "^1.0.1",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.11",
"@mui/material": "^5.14.11",
"@mui/icons-material": "^5.14.12",
"@mui/material": "^5.14.12",
"@table-library/react-table-library": "4.1.7",
"@types/lodash-es": "^4.17.9",
"@types/node": "^20.8.2",
"@types/react": "^18.2.24",
"@types/react-dom": "^18.2.8",
"@types/react": "^18.2.25",
"@types/react-dom": "^18.2.10",
"@types/react-router-dom": "^5.3.3",
"alova": "^2.13.1",
"async-validator": "^4.2.5",
Expand Down Expand Up @@ -69,7 +69,7 @@
"prettier": "^3.0.3",
"rollup-plugin-visualizer": "^5.9.2",
"terser": "^5.21.0",
"vite": "^4.4.10",
"vite": "^4.4.11",
"vite-plugin-svgr": "^4.1.0",
"vite-tsconfig-paths": "^4.2.1"
},
Expand Down
168 changes: 92 additions & 76 deletions interface/yarn.lock
View file
Open in desktop
Expand Up @@ -347,7 +347,7 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.22.15, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @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.20.7, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7":
version: 7.22.15
resolution: "@babel/runtime@npm:7.22.15"
dependencies:
Expand All @@ -356,6 +356,15 @@ __metadata:
languageName: node
linkType: hard

"@babel/runtime@npm:^7.23.1":
version: 7.23.1
resolution: "@babel/runtime@npm:7.23.1"
dependencies:
regenerator-runtime: ^0.14.0
checksum: e57ab1436d4845efe67c3f76d578508bb584173690ecfeac105bc4e09d64b2aa6a53c1e03bca3c97cc238e5390a804e5a4ded211e6350243b735905ca45a4822
languageName: node
linkType: hard

"@babel/template@npm:^7.22.15, @babel/template@npm:^7.22.5":
version: 7.22.15
resolution: "@babel/template@npm:7.22.15"
Expand Down Expand Up @@ -896,14 +905,14 @@ __metadata:
languageName: node
linkType: hard

"@mui/base@npm:5.0.0-beta.17":
version: 5.0.0-beta.17
resolution: "@mui/base@npm:5.0.0-beta.17"
"@mui/base@npm:5.0.0-beta.18":
version: 5.0.0-beta.18
resolution: "@mui/base@npm:5.0.0-beta.18"
dependencies:
"@babel/runtime": ^7.22.15
"@babel/runtime": ^7.23.1
"@floating-ui/react-dom": ^2.0.2
"@mui/types": ^7.2.4
"@mui/utils": ^5.14.11
"@mui/types": ^7.2.5
"@mui/utils": ^5.14.12
"@popperjs/core": ^2.11.8
clsx: ^2.0.0
prop-types: ^15.8.1
Expand All @@ -914,43 +923,43 @@ __metadata:
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 7d0b67a279f9b63e88cd74426153fae129b3bbe670ccc06ba293357edb5466df01e8f953d86944a1ba500a8cf7cb2c2f3af0691b62b1a8e983dfbe19abc93717
checksum: 0d8f3743a69508b5259d7cd595acc3717f4ad60e1606bd7e1c58b82886ae74747151f6492a14f994ef5f88698fb02f95c84bf94a72dc71160f79965920f490bd
languageName: node
linkType: hard

"@mui/core-downloads-tracker@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/core-downloads-tracker@npm:5.14.11"
checksum: 206e74991d1fb1ce83f915d8761d08e793462a98213f433368a085b4715292580efcd4df5368266d7da1a2f7cc851e6f3762db27f24958d214aedbae6e562abd
"@mui/core-downloads-tracker@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/core-downloads-tracker@npm:5.14.12"
checksum: 0cfd7e96f39b585cf58f98476e21240f92cd0a3b2b70e027d5483e1a10593426a05573f1802e9d8dc7723c54ce322a9496b2765987aaf0d5ab37b55787bfa512
languageName: node
linkType: hard

"@mui/icons-material@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/icons-material@npm:5.14.11"
"@mui/icons-material@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/icons-material@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@babel/runtime": ^7.23.1
peerDependencies:
"@mui/material": ^5.0.0
"@types/react": ^17.0.0 || ^18.0.0
react: ^17.0.0 || ^18.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: f956b48b8ac83318a8e5e93a084f4f62ce82694e591a611e40d35c7c41d6395339bbde0416d0b80927e1ed3a051d4984076a090c2f8655046ac281bc5ca6466e
checksum: 06e63cdcb1ca9aa66d4d0c1d31d4e10135b9a342997e9e1da29cde529ceff5fb2471f20892769bf6163ae934d941e494bdd769a622c7d0ed7474728b4ce45e2b
languageName: node
linkType: hard

"@mui/material@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/material@npm:5.14.11"
"@mui/material@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/material@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@mui/base": 5.0.0-beta.17
"@mui/core-downloads-tracker": ^5.14.11
"@mui/system": ^5.14.11
"@mui/types": ^7.2.4
"@mui/utils": ^5.14.11
"@babel/runtime": ^7.23.1
"@mui/base": 5.0.0-beta.18
"@mui/core-downloads-tracker": ^5.14.12
"@mui/system": ^5.14.12
"@mui/types": ^7.2.5
"@mui/utils": ^5.14.12
"@types/react-transition-group": ^4.4.6
clsx: ^2.0.0
csstype: ^3.1.2
Expand All @@ -970,32 +979,32 @@ __metadata:
optional: true
"@types/react":
optional: true
checksum: 53b5ba0732cee87c82c16a64c3bc145f1fd88ae014c5d1dab9f84c24a212375f75cf1cb44b0ceca80135e009ec4f1fe13a8a3ca2079a55bbe5a15f22a706429c
checksum: 65c868b1fc9b73e2afa17c12f4e9b410dccb9f5ac21b6d37f913811ec19e84c50bc724b40c67a51bbfeb699550ad10c7f8b265c2518d846dfe8056cb0203ec1c
languageName: node
linkType: hard

"@mui/private-theming@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/private-theming@npm:5.14.11"
"@mui/private-theming@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/private-theming@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@mui/utils": ^5.14.11
"@babel/runtime": ^7.23.1
"@mui/utils": ^5.14.12
prop-types: ^15.8.1
peerDependencies:
"@types/react": ^17.0.0 || ^18.0.0
react: ^17.0.0 || ^18.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: e9b96b86355685a9dcbf95e617f3d86b33c502e005a5c6cd9b9cc64d102742b00b960560666d49b0ef0c4f4dac2d7a17f81ca6a745ff893b64e22515b53bd8fc
checksum: dbd24ffd3ff0d514c44b043c3fa34035403fdb9ccf459efb5c15fff127d6cc01471b7e748798c37c324ff20fd985f5923807271a5e3b857254c2e51a39ab8e4f
languageName: node
linkType: hard

"@mui/styled-engine@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/styled-engine@npm:5.14.11"
"@mui/styled-engine@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/styled-engine@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@babel/runtime": ^7.23.1
"@emotion/cache": ^11.11.0
csstype: ^3.1.2
prop-types: ^15.8.1
Expand All @@ -1008,19 +1017,19 @@ __metadata:
optional: true
"@emotion/styled":
optional: true
checksum: b71cf3d9d0377bc5cdba01f4f72153147310b4d054fb10b6e5899b5307d05cc44770bcd8ba61069806c35bd367e5241328fbce7a7e91c7ec11e483fdb79fbc49
checksum: 55e4b7a0990a5f92248e2e1e622ca6306decb42757e8aa1abe2687e2b46b8ee1d7fbfcef402ea705ac286efaf085d1aed526af6aa346ae5048d8376bb696aa3d
languageName: node
linkType: hard

"@mui/system@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/system@npm:5.14.11"
"@mui/system@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/system@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@mui/private-theming": ^5.14.11
"@mui/styled-engine": ^5.14.11
"@mui/types": ^7.2.4
"@mui/utils": ^5.14.11
"@babel/runtime": ^7.23.1
"@mui/private-theming": ^5.14.12
"@mui/styled-engine": ^5.14.12
"@mui/types": ^7.2.5
"@mui/utils": ^5.14.12
clsx: ^2.0.0
csstype: ^3.1.2
prop-types: ^15.8.1
Expand All @@ -1036,28 +1045,28 @@ __metadata:
optional: true
"@types/react":
optional: true
checksum: 3677dce2b1c010d5679f96a8c9cd54d803558b9ac881e4adec480ae7c3136b54895f5850131abf31b7d16493964a048d5261128332cecf2e3944c9dd58814bf1
checksum: 93f77c7a0673a116efe92d3f290886033278d915386c5aa29056c4a4557540db2865c4405140e669c7be801d6cba3dd3ddea2bb63bfc7eedd18e5b829a13ab80
languageName: node
linkType: hard

"@mui/types@npm:^7.2.4":
version: 7.2.4
resolution: "@mui/types@npm:7.2.4"
"@mui/types@npm:^7.2.5":
version: 7.2.5
resolution: "@mui/types@npm:7.2.5"
peerDependencies:
"@types/react": "*"
"@types/react": ^17.0.0 || ^18.0.0
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 17411effd184eff34d6a1a55b2249c7e1ef195bb30c48154f0b16fdce428ff55be4ec5dde8b4a556c01eda2d34e3dcc18d925f8fdee606f5bc15f91167f0ecbc
checksum: df381cb230b1335d46315517da3535fa362bb53388a9d6e87964ee77991685442a6cb5a8f39cbd878d89176a152fe699aa6ecc681957ecf4695b85db0d2abe83
languageName: node
linkType: hard

"@mui/utils@npm:^5.14.11":
version: 5.14.11
resolution: "@mui/utils@npm:5.14.11"
"@mui/utils@npm:^5.14.12":
version: 5.14.12
resolution: "@mui/utils@npm:5.14.12"
dependencies:
"@babel/runtime": ^7.22.15
"@types/prop-types": ^15.7.5
"@babel/runtime": ^7.23.1
"@types/prop-types": ^15.7.7
prop-types: ^15.8.1
react-is: ^18.2.0
peerDependencies:
Expand All @@ -1066,7 +1075,7 @@ __metadata:
peerDependenciesMeta:
"@types/react":
optional: true
checksum: 21048b65e482e2f4279bf2b0e1619f026ed605bfe71818f6373b6362abc5062ea293ab7791691da1275de2d72b16cc5dafca70c2169359eca0b1c46c52aba879
checksum: 1204e6699ddc508a3d46ec86b0cb31abea59cf41ce3bcbff18f651731783ced0217b7274452662ec7bf4a230c9b1bebd184b34a8729e43ceb3a6a0e50e72bcdf
languageName: node
linkType: hard

Expand Down Expand Up @@ -1482,19 +1491,26 @@ __metadata:
languageName: node
linkType: hard

"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.5":
"@types/prop-types@npm:*":
version: 15.7.7
resolution: "@types/prop-types@npm:15.7.7"
checksum: 26d565ebae8c28dede71547d687367ce74eeccc645fdbef2d38478fe293996be24784fa6190586ba303ccd274aa94d8a631d36a5d9b8e0c08f5647ff3244d72c
languageName: node
linkType: hard

"@types/react-dom@npm:^18.2.8":
version: 18.2.8
resolution: "@types/react-dom@npm:18.2.8"
"@types/prop-types@npm:^15.7.7":
version: 15.7.8
resolution: "@types/prop-types@npm:15.7.8"
checksum: 706b3de6faa5c1a4763fc90069f25ddc54108e8b43e9724e22f510b103c418571bf14b34b241fcacd6875650959c8374af7f4633f80ec6e33e7525cb42ef6a30
languageName: node
linkType: hard

"@types/react-dom@npm:^18.2.10":
version: 18.2.10
resolution: "@types/react-dom@npm:18.2.10"
dependencies:
"@types/react": "*"
checksum: a2afa9f626751f2314ddbecb5503122912ff646827b1c81b7b230ce04083c43b71c82b02244526eb88c1795019033364a4afee0f7f719e46116a51ca8e287613
checksum: ac4056c3b8ba5461a58a7933e1f98d772e877f275a1b4169a936391900aec8f3c8e6125ccbbda530842cd9d108a2be8c994c7f48bfd801f89702e2de9064d834
languageName: node
linkType: hard

Expand Down Expand Up @@ -1539,14 +1555,14 @@ __metadata:
languageName: node
linkType: hard

"@types/react@npm:^18.2.24":
version: 18.2.24
resolution: "@types/react@npm:18.2.24"
"@types/react@npm:^18.2.25":
version: 18.2.25
resolution: "@types/react@npm:18.2.25"
dependencies:
"@types/prop-types": "*"
"@types/scheduler": "*"
csstype: ^3.0.2
checksum: a83c7ae0010b265012ef038e3e00e4708c27c523f0aa0631e44f934e9c5338a51b6db1901f91d8ba10d3dc292a3a200b2cb5e47430cde58fbf988969866fe75a
checksum: 17559ab8e9a3347b466eb782e21fe45f841e0e39d3f656e4711693cb6d193f948a9913c9e96b64bc4700eb24b34c47f15adbddcc39c596b4b3b79c99619b83bf
languageName: node
linkType: hard

Expand Down Expand Up @@ -1694,16 +1710,16 @@ __metadata:
"@babel/core": ^7.23.0
"@emotion/react": ^11.11.1
"@emotion/styled": ^11.11.0
"@mui/icons-material": ^5.14.11
"@mui/material": ^5.14.11
"@mui/icons-material": ^5.14.12
"@mui/material": ^5.14.12
"@preact/compat": ^17.1.2
"@preact/preset-vite": ^2.5.0
"@table-library/react-table-library": 4.1.7
"@types/babel__core": ^7
"@types/lodash-es": ^4.17.9
"@types/node": ^20.8.2
"@types/react": ^18.2.24
"@types/react-dom": ^18.2.8
"@types/react": ^18.2.25
"@types/react-dom": ^18.2.10
"@types/react-router-dom": ^5.3.3
"@typescript-eslint/eslint-plugin": ^6.7.4
"@typescript-eslint/parser": ^6.7.4
Expand Down Expand Up @@ -1738,7 +1754,7 @@ __metadata:
terser: ^5.21.0
typesafe-i18n: ^5.26.2
typescript: ^5.2.2
vite: ^4.4.10
vite: ^4.4.11
vite-plugin-svgr: ^4.1.0
vite-tsconfig-paths: ^4.2.1
languageName: unknown
Expand Down Expand Up @@ -6262,9 +6278,9 @@ react@latest:
languageName: node
linkType: hard

"vite@npm:^4.4.10":
version: 4.4.10
resolution: "vite@npm:4.4.10"
"vite@npm:^4.4.11":
version: 4.4.11
resolution: "vite@npm:4.4.11"
dependencies:
esbuild: ^0.18.10
fsevents: ~2.3.2
Expand Down Expand Up @@ -6298,7 +6314,7 @@ react@latest:
optional: true
bin:
vite: bin/vite.js
checksum: d1359f147eb84aad9922460848184f14295e76f335ab03f90a585886ff070e1a7c74996022b3bb07da0a3130c9829565b5556e6eb1d0db12a8aad26f3694d445
checksum: 550af0f67b600f603d0c129b74ac18dfa674d19e2b7dba28f4214d5edeba217a91fb7b8f4f47037aa0297f142d22360780a0a4533b27dbaacd2894030f61e5f4
languageName: node
linkType: hard

Expand Down
4 changes: 2 additions & 2 deletions src/device_library.h
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@
{170, DeviceType::BOILER, "Logano GB212", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{172, DeviceType::BOILER, "Enviline/Compress 6000AW/Hybrid 3000-7000iAW/SupraEco/Geo 5xx/WLW196i/WSW196i", DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP},
{173, DeviceType::BOILER, "Geo 5xx", DeviceFlags::EMS_DEVICE_FLAG_HEATPUMP},
{195, DeviceType::BOILER, "Condens 5000i/Greenstar 8000/GC9800IW", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{195, DeviceType::BOILER, "Condens 5000i/Greenstar 8000/GC9800IW/GB192i.2", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{203, DeviceType::BOILER, "Logamax U122/Cerapur", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{206, DeviceType::BOILER, "Ecomline Excellent", DeviceFlags::EMS_DEVICE_FLAG_NONE},
{208, DeviceType::BOILER, "Logamax Plus/GB192/Condens GC9000/Greenstar ErP", DeviceFlags::EMS_DEVICE_FLAG_NONE},
Expand Down Expand Up @@ -81,7 +81,7 @@
{203, DeviceType::THERMOSTAT, "EasyControl CT200", DeviceFlags::EMS_DEVICE_FLAG_EASY | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18, cannot write

// Thermostat - Buderus/Nefit/Bosch specific - 0x17 / 0x10 / 0x18 / 0x19-0x1B for hc2-4 / 0x38
{ 4, DeviceType::THERMOSTAT, "UI800", DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10
{ 4, DeviceType::THERMOSTAT, "UI800/BC400", DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10
{ 65, DeviceType::THERMOSTAT, "RC10", DeviceFlags::EMS_DEVICE_FLAG_RC20_N},// 0x17
{ 67, DeviceType::THERMOSTAT, "RC30", DeviceFlags::EMS_DEVICE_FLAG_RC30_N},// 0x10 - based on RC35
{ 77, DeviceType::THERMOSTAT, "RC20/Moduline 300", DeviceFlags::EMS_DEVICE_FLAG_RC20},// 0x17
Expand Down