Commit Graph

175 Commits

Author SHA1 Message Date
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
ypaindaveine
658a230ea3 Add features to WW messages (0x33, 0x34) to improve WW monitoring. 2020-02-29 21:11:49 +01:00
Paul
42d6cb1c9d added @PhillyGilly SM200 PR - #267 2020-02-26 12:14:16 +01:00
Paul
5d7feb1722 added 2 x warm water boiler temps 2020-02-23 15:47:14 +01:00
Paul
93dff6493a optimize detection of EMS devices 2020-02-19 22:22:12 +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
Paul
fd24fe3a46 RC300 changes - #256 2020-02-13 15:40:25 +01:00
proddy
7bd70e735c cleaned up mixing 2020-02-09 22:04:43 +01:00
Paul
ec25636d99 some mixing minor changes 2020-02-03 23:35:35 +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
691c9dfeac formatting 2020-01-31 00:07:24 +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
0fb9019c51 Sync with upstream/dev 2020-01-12 18:41:53 +01:00
MichaelDvP
fc13004093 add mqtt-subscription for WWcirculation 2020-01-12 13:46:05 +01:00
MichaelDvP
041203936e Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-12 09:59:51 +01:00
Paul
6b81b57b02 refactor ds18 #287 2020-01-11 22:12:00 +01:00
MichaelDvP
13e87bab97 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-05 10:49:07 +01:00
Paul
daf24af323 cleaned up detection - #283 2020-01-04 23:15:41 +01:00
MichaelDvP
f818db2718 Merge branch 'dev' of https://github.com/proddy/EMS-ESP.git into MM10 2020-01-04 09:56:03 +01:00
Paul
5ce0b64bb4 support for multiple productids - #278 2020-01-03 13:10:26 +01:00
Paul
d2316518ac don't detect HCs if there not active - #238 2020-01-02 18:05:40 +01:00
MichaelDvP
a8aa5e4f7f merge with proddy dev branch 2020-01-02 09:43:26 +01:00
MichaelDvP
0b6c1715d5 changed some values from ushort to short and notset-value to -32000 2020-01-01 14:00:29 +01:00
MichaelDvP
3005e0553d changed some values from ushort to short and notset-value to -32000 2020-01-01 13:23:57 +01:00
Paul
7a1b1603cd MM10 merge from MichaelDvP 2019-12-30 15:53:13 +01:00
MichaelDvP
5091ce02c2 Merge remote-tracking branch 'upstream/dev' into MM10 2019-12-30 15:03:37 +01:00
Paul
4fbd135bfe multiple thermostat choice - #238 2019-12-30 14:48:06 +01:00
MichaelDvP
a22e64a8ca MM10 mixer added, changed WWDesired to WWDesinfection, added boier exhaust temperature 2019-12-30 13:35:23 +01:00
Paul
33d930b7cd fixes for #263, MQTT flooding, 2019-12-20 14:53:12 +01:00
Paul
e9ba4991b3 refactor publish_time - https://github.com/proddy/EMS-ESP/issues/253 2019-12-06 20:28:51 +01:00
proddy
9a0780ba77 added RFM200 2019-11-19 13:12:11 +01:00
proddy
4a56f0dc9f added log w and more ems+ messages 2019-11-14 23:13:47 +01:00
Paul
81af418294 code formatting 2019-11-13 10:22:46 +01:00
Paul
ae5290131d optimzed how device descriptions are read 2019-11-13 10:21:44 +01:00
Paul
cb09041279 mem debugging 2019-11-12 08:50:31 +01:00
proddy
9e3f5700e1 code optimizations on EMS device library 2019-11-11 23:54:59 +01:00
proddy
26b8185f56 keep thermostat generic, and remove HA's heat mode 2019-11-05 18:21:13 +01:00
proddy
9f146768b4 made all doubles to floats 2019-11-04 19:16:07 +01:00
Paul
6275245b03 timezone support 2019-11-01 15:04:17 +01:00
Paul
0bb598efe7 added Greenstar i 2019-10-29 18:03:08 +01:00
Christian Weithe
c62502052d RC20RF tap water one time loading function 2019-10-28 19:26:29 +01:00
Paul
9835ddb127 added MM200 and Junkers Cerapur Top - https://github.com/proddy/EMS-ESP/issues/222 2019-10-27 15:04:18 +01:00
Paul
0ac4ad3f37 tidy up telnet messages 2019-10-18 15:19:26 +02:00
Paul
f39ecb860a remove emsuart debug messages 2019-10-14 18:25:12 +02:00