andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 09:19:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,136 Commits 5 Branches 25 Tags
2f58f88ee3aa2740fd9be01a84096b8320be3381
Commit Graph

154 Commits

Author SHA1 Message Date
Paul
2f58f88ee3 minor prep for PR merge 2020-04-22 15:58:16 +02:00
Paul
b51d34add0 merge of Yves' "Added retrieving settings (0xA5)" feature 2020-03-23 11:40:48 +01:00
ypaindaveine
7253299469 Added retrieving settings (0xA5) (validated on RC30N), and MQTT cmd to set display, building type and language. 2020-03-22 20:02:22 +01:00
Paul
1385af3d54 added IP and version to MQTT start payload, added support for RC100/Moduline 1010, Fixed Junkers thermostat writing 2020-03-06 17:13:29 +01:00
Paul
64def6e4cd #335 fix again 2020-03-04 21:05:15 +01:00
Paul
98a41db973 support writing to FR100 - #335 2020-03-03 22:23:53 +01:00
Paul
3c66031870 minor text changes 2020-03-01 17:03:52 +01:00
Paul
006fae89c4 Merge branch 'dev' of https://github.com/proddy/EMS-ESP into dev 2020-03-01 16:47:38 +01:00
Paul
4cc670f010 emsplus for Tx 2020-03-01 16:47:26 +01:00
ypaindaveine
634e7cb7cd Added mixer log, and stub for EMS type 0xAC. 2020-03-01 12:23:13 +01:00
Paul
81188eccd9 make Moduline 200 behave like RC10 2020-02-28 14:22:41 +01:00
Paul
b7dad9d9d9 removed no-write flag for Junkers FR100 2020-02-28 14:05:27 +01:00
Paul
52d8231229 added RC20 and SM200 to MQTT 2020-02-26 18:14:51 +01:00
proddy
74ef11631c added Moduline 200 & Sieger ES72 2020-02-25 15:47:28 +01:00
Paul
b4e1d35d86 multiple bus ids - #329 2020-02-18 16:03:54 +01:00
Paul
ce49b37a34 minor formatting - no feature changes 2020-02-16 21:32:10 +01:00
proddy
4ef86e66ae removed junkers mixers which wern't actually mixers 2020-02-16 10:56:29 +01:00
Paul
ff97b3b70b use dallas sensor address as ID - #327 2020-02-12 22:00:45 +01:00
proddy
a2be2f7c6b rename mixer to mixing 2020-02-09 22:03:45 +01:00
proddy
416cd43e13 added back autodetect scan, added RC30 set temp fix, fixed detection of controllers - #318 #311 2020-02-03 17:52:39 +01:00
Paul
d70b101973 RC30 nehave like RC35 - #318 2020-02-02 11:07:46 +01:00
Paul
691c9dfeac formatting 2020-01-31 00:07:24 +01:00
MichaelDvP
875ca6e9ae Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-29 08:16:47 +01:00
MichaelDvP
610b9525c7 Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-29 08:16:25 +01:00
Paul
1eb08b74c7 added Buderus Logamax Plus GB022-24 #311 2020-01-28 21:12:32 +01:00
Paul
03489d43f4 force sel temp on RC35 temperature change - #310 2020-01-26 21:10:07 +01:00
MichaelDvP
9ad6bbfadd Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-20 15:16:53 +01:00
Paul
b037efb48d minor text changes 2020-01-19 14:53:08 +01:00
MichaelDvP
b950cf8246 summery over last commitsto MM10 
- add MM200 warm water circuits (#299)
- add terminal boiler wwactive on/off command (#301)
- show first active thermostat hc in web (instead always 1)
- add log d [id] to show messages from/to specific ID (may replace log t and log s)
- add mixer version to info
- add warm water circulation active to terminal and mqtt
- mqtt subscribe only to active hc
- change NOTSET values for short/ushort and set the compare to level (match 0x7D00, 0x8000 and 0x8300 as notset)
- add calculated flow temperature to thermostat stats
 2020-01-18 19:12:53 +01:00
MichaelDvP
093df344e2 Test 2020-01-13 10:25:37 +01:00
proddy
10f50b1974 typo with CS100 -> CS200 2020-01-08 12:34:58 +01:00
proddy
66b2595d4e added Sense II / Bosch CS200 2020-01-06 14:12:04 +01:00
Paul
daf24af323 cleaned up detection - #283 2020-01-04 23:15:41 +01:00
Paul
f31b2f3a6d tidy up 2020-01-04 13:48:02 +01:00
Paul
5ce0b64bb4 support for multiple productids - #278 2020-01-03 13:10:26 +01:00
Paul
0af60a320d writing to Junkers thermostats - #138 2020-01-03 11:24:12 +01:00
Paul
c8b4f57b32 rollback MM10 HC2 (which isn't) 2020-01-01 21:59:21 +01:00
Paul
d3427011fb added 0xAC for HC2 on switch and mixers 2020-01-01 14:58:39 +01:00
Paul
d8bf33e4db rename W-B ErP Boiler Control Panel 2019-12-31 11:48:07 +01:00
Paul
1e7a9483e2 added w-B ErP controller (#240) 2019-12-30 20:45:09 +01:00
MichaelDvP
5091ce02c2 Merge remote-tracking branch 'upstream/dev' into MM10 2019-12-30 15:03:37 +01:00
Paul
a3faf2cf18 SM200 support 2019-12-30 14:46:08 +01:00
MichaelDvP
a22e64a8ca MM10 mixer added, changed WWDesired to WWDesinfection, added boier exhaust temperature 2019-12-30 13:35:23 +01:00
proddy
f27088c035 fix for sieger, typo in devices library - #266 2019-12-26 17:34:37 +01:00
proddy
b5eebea6a1 remove MM400 #262 2019-12-23 16:18:10 +01:00
Paul
9b31e3f60a formatting 2019-12-08 09:08:27 +01:00
proddy
ccc9fd358a added W-B Sense II 2019-11-29 22:06:11 +01:00
proddy
9a0780ba77 added RFM200 2019-11-19 13:12:11 +01:00
Paul
044079070c fix junkers detection - https://github.com/proddy/EMS-ESP/issues/224 2019-11-17 19:24:09 +01:00
proddy
4a56f0dc9f added log w and more ems+ messages 2019-11-14 23:13:47 +01:00