320 Commits

Author	SHA1	Message	Date
Paul	ff97b3b70b	use dallas sensor address as ID - #327	2020-02-12 22:00:45 +01:00
proddy	c801160351	minor changes to mixing	2020-02-09 22:05:11 +01:00
proddy	55225f7028	ignore setpoint temp on RC300/310 when in night mode - #256	2020-02-08 14:37:15 +01:00
Paul	7f503b166f	fix controller/thermostat clash #321	2020-02-04 22:12:29 +01:00
Paul	af3971ef02	increase buffer length to show boiler details	2020-02-03 23:51:49 +01:00
Paul	ec25636d99	some mixing minor changes	2020-02-03 23:35:35 +01:00
Paul	e8e7b22e30	fix RC30 mode - #318	2020-02-03 23:16:26 +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	f969226b05	fix for HC detection - #305	2020-02-01 09:07:09 +01:00
Paul	9b3ca30959	fix non-boiler check #317	2020-01-31 22:44:35 +01:00
Paul	ce97c55822	fix for bosch boiler temp #314 and MM10 on HC2 #270	2020-01-31 11:09:58 +01:00
Paul	5140db5444	seperate boiler detection - #317	2020-01-31 00:08:04 +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	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	cd84881769	rename 'stats' to 'data'	2020-01-19 14:53:42 +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
MichaelDvP	0fb9019c51	Sync with upstream/dev	2020-01-12 18:41:53 +01:00
MichaelDvP	db4fa83c3c	merge with upstream/dev	2020-01-12 13:50:57 +01:00
MichaelDvP	fc13004093	add mqtt-subscription for WWcirculation	2020-01-12 13:46:05 +01:00
Paul	698358f04e	correct Mixer module flowtemp in MQTT #270	2020-01-12 12:38:00 +01:00
MichaelDvP	041203936e	Merge remote-tracking branch 'upstream/dev' into MM10	2020-01-12 09:59:51 +01:00
MichaelDvP	1c424d372f	change command for WW-OneTime	2020-01-12 09:59:19 +01:00
Paul	6b81b57b02	refactor ds18 #287	2020-01-11 22:12:00 +01:00
Paul	c3905e0b33	included showing detection of external temperature sensors in startup and 'autodetect' also re-checks for new external sensors. #238	2020-01-11 16:29:51 +01:00
MichaelDvP	4be2383ad8	Merge remote-tracking branch 'upstream/dev' into MM10	2020-01-09 10:22:36 +01:00
Paul	382946846e	increase bus offline timeout from 15 to 45 seconds - #267	2020-01-07 22:04:14 +01:00
Paul	62fff2c3bf	#238 - various optimizatons for multiple HCs on RC35s	2020-01-06 21:51:02 +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	0537705924	Fix unknown device	2020-01-04 16:05:21 +01:00
Paul	ae61c357c0	fix #285	2020-01-04 15:39:07 +01:00
Paul	4484c6db60	#284 #283	2020-01-04 13:49:11 +01:00
Paul	5577685d85	bug fix for processing version when no match found	2020-01-03 21:19:22 +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	18c6f7a7b7	clean up HCs - #238	2020-01-02 22:45:13 +01:00
Paul	d2316518ac	don't detect HCs if there not active - #238	2020-01-02 18:05:40 +01:00
Paul	c8b4f57b32	rollback MM10 HC2 (which isn't)	2020-01-01 21:59:21 +01:00
Paul	2684ccc594	any unsigned short >0x8000 is a non-value	2020-01-01 14:59:11 +01:00
Paul	9358544a7d	minor fix for rendering mixer flowtemp - #270	2019-12-31 13:31:13 +01:00
Paul	ca5912ddbd	codacy/lint warnings	2019-12-31 11:48:20 +01:00
Paul	6798b59246	prevent controller and boiler competing for ubamaster - #271	2019-12-31 11:34:40 +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	1a2c58d9a8	take only boilTemp from 0x18 Fast telegrams	2019-12-23 20:28:26 +01:00
Paul	33d930b7cd	fixes for #263, MQTT flooding,	2019-12-20 14:53:12 +01:00