188 Commits

Author	SHA1	Message	Date
MichaelDvP	d284a3c1b8	solar energy values changed to 32bit	2020-04-26 17:48:48 +02:00
Paul	743e09e5f4	render unsigned shorts correctly - #372	2020-04-24 10:41:12 +02:00
Proddy	e0dd9b4068	Merge branch 'dev' into RC20N	2020-04-22 16:19:51 +02:00
Paul	2f58f88ee3	minor prep for PR merge	2020-04-22 15:58:16 +02:00
MichaelDvP	0e750d44a0	mqtt temperature pushback, read seltemp on RC35, MM50 fix, use first found thermostat	2020-04-19 15:47:52 +02:00
MichaelDvP	ff1b45fd8b	add new RC20 thermostat (messages 0xAD, 0xAE)	2020-04-09 09:52:14 +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	f5f2791bcf	lowered sel flow temp #344	2020-03-12 14:33:54 +01:00
Paul	6397754a05	more thermostat mode generalization	2020-03-09 18:03:58 +01:00
Paul	37fe454278	use DHW temp instead of boiler temp, removed return temp - #345	2020-03-08 21:49:09 +01:00
Paul	c55ed82c30	optimize thermostat modes - #138	2020-03-08 19:41:21 +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
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