804 Commits

Author	SHA1	Message	Date
Paul	4f753077df	b22	2020-01-31 11:09:22 +01:00
Paul	80a7f47565	formatting	2020-01-31 00:08:14 +01:00
Paul	5140db5444	seperate boiler detection - #317	2020-01-31 00:08:04 +01:00
Paul	a626f4ece4	formatting	2020-01-31 00:07:38 +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	761599cf06	fix showing day/night mode in web	2020-01-28 21:13:09 +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
MichaelDvP	e819d082d7	Namings	2020-01-20 15:01:25 +01:00
Paul	cdb12e99e0	rename stats to data	2020-01-19 14:54:20 +01:00
Paul	cd84881769	rename 'stats' to 'data'	2020-01-19 14:53:42 +01:00
Paul	b037efb48d	minor text changes	2020-01-19 14:53:08 +01:00
Paul	db2d2e994d	mqttlog [all] function	2020-01-19 14:52:54 +01:00
Paul	5911aa8506	bump to b18	2020-01-19 14:52:26 +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
Paul	e6efa1aebd	retry publish, count #mqtt fails in system cmd - #264	2020-01-12 13:54:01 +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
Paul	5b6df62f8f	only send heartbeat after MQTT connect	2020-01-12 12:37:28 +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	aa721abe77	publish_time changes - #287	2020-01-12 00:27:14 +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
proddy	10f50b1974	typo with CS100 -> CS200	2020-01-08 12:34:58 +01:00
Paul	382946846e	increase bus offline timeout from 15 to 45 seconds - #267	2020-01-07 22:04:14 +01:00
Paul	9d9884065e	bump	2020-01-07 22:03:38 +01:00
Paul	46f32682f0	don't show boiler details if it isnt connected	2020-01-07 22:03:31 +01:00
Paul	62fff2c3bf	#238 - various optimizatons for multiple HCs on RC35s	2020-01-06 21:51:02 +01:00
proddy	66b2595d4e	added Sense II / Bosch CS200	2020-01-06 14:12:04 +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
MichaelDvP	95b65269e5	merged with dev 1.9.5b12	2020-01-04 14:52:17 +01:00
Paul	4484c6db60	#284 #283	2020-01-04 13:49:11 +01:00
Paul	f31b2f3a6d	tidy up	2020-01-04 13:48:02 +01:00
Paul	1ec05d7eb1	1.9.5b12	2020-01-04 13:47:26 +01:00
MichaelDvP	a45aae4b98	fixed bug in _getHeatingCirciut	2020-01-04 13:43:14 +01:00
MichaelDvP	6a2fd44028	MM10 Mixing circuit defaults to hc1	2020-01-04 12:28:50 +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
MichaelDvP	5c6f931d5a	HC2 fixed for MM10	2020-01-04 09:55:22 +01:00
Paul	5577685d85	bug fix for processing version when no match found	2020-01-03 21:19:22 +01:00