1036 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
proddy	55fcfb132f	update formatting	2020-01-24 17:42:17 +01:00
proddy	133e87c13b	dpl fix	2020-01-24 16:54:28 +01:00
proddy	6c5e00e74b	build on ubuntu 18	2020-01-24 16:41:49 +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	dbe0b083dd	Merge branch 'dev' of https://github.com/proddy/EMS-ESP into dev	2020-01-19 14:54:37 +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
Paul	ed4b16f24d	update arduinojson	2020-01-19 14:52:17 +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
Proddy	8f564ab1f7	fix link to supported devices	2020-01-16 10:30:56 +01:00
MichaelDvP	9343132820	Merge remote-tracking branch 'upstream/dev' into MM10	2020-01-13 10:25:42 +01:00
MichaelDvP	093df344e2	Test	2020-01-13 10:25:37 +01:00
Proddy	bf12ef313c	Delete FUNDING.yaml	2020-01-12 20:59:17 +01:00
Proddy	89f3ce98a1	Create FUNDING.yml	2020-01-12 20:59:07 +01:00
Proddy	e3940c3797	Create FUNDING.yaml ... keeping in sync with master	2020-01-12 20:58:21 +01:00
Proddy	e4cf074c66	Create weekly-digest.yml	2020-01-12 20:56:18 +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	29624280ba	move all docs to wiki, updated README	2020-01-12 13:33:30 +01:00
Paul	c461dcfd35	updated to point to wiki	2020-01-12 13:29:18 +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
Paul	9f37dfb802	silent mode in gulp	2020-01-11 16:28:33 +01:00
Paul	a38e21ac89	moved wiki again	2020-01-11 15:09:33 +01:00
Paul	7b561f0540	updated wiki	2020-01-09 23:04:27 +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	f99991bf85	also build web on release target	2020-01-07 22:03:07 +01:00
Paul	62fff2c3bf	#238 - various optimizatons for multiple HCs on RC35s	2020-01-06 21:51:02 +01:00
Paul	fff38f9003	travis fix again	2020-01-06 21:27:16 +01:00
Paul	68f487d270	trying to fix travis build with gem error	2020-01-06 20:51:23 +01:00