1142 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
proddy	ce03746c92	get off dev branch for travis dpl	2020-01-06 14:48:43 +01:00
proddy	2efa908551	upgrade to python 3.8	2020-01-06 14:12:13 +01:00
proddy	66b2595d4e	added Sense II / Bosch CS200	2020-01-06 14:12:04 +01:00
proddy	9c8d180c8e	ignore .bin files from build script	2020-01-06 14:11:49 +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
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
MichaelDvP	7f9dda53e7	test	2020-01-02 09:54:27 +01:00
MichaelDvP	a8aa5e4f7f	merge with proddy dev branch	2020-01-02 09:43:26 +01:00
Paul	c8b4f57b32	rollback MM10 HC2 (which isn't)	2020-01-01 21:59:21 +01:00
MichaelDvP	dcbccc8604	MM10 assigned to HC2	2020-01-01 18:35:54 +01:00
MichaelDvP	48b8d925ff	Merge remote-tracking branch 'upstream/dev' into MM10	2020-01-01 16:44:44 +01:00
Paul	2684ccc594	any unsigned short >0x8000 is a non-value	2020-01-01 14:59:11 +01:00
Paul	d3427011fb	added 0xAC for HC2 on switch and mixers	2020-01-01 14:58:39 +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	9c9d41b644	Merge remote-tracking branch 'upstream/dev' into MM10	2020-01-01 13:24:26 +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	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	d8bf33e4db	rename W-B ErP Boiler Control Panel	2019-12-31 11:48:07 +01:00
Paul	a8d993188d	b8	2019-12-31 11:34:59 +01:00
Paul	6798b59246	prevent controller and boiler competing for ubamaster - #271	2019-12-31 11:34:40 +01:00
Paul	75b47c1609	force autodetect after changing thermostat - #238	2019-12-30 20:48:03 +01:00
Paul	1e7a9483e2	added w-B ErP controller (#240)	2019-12-30 20:45:09 +01:00
Paul	7a1b1603cd	MM10 merge from MichaelDvP	2019-12-30 15:53:13 +01:00
Proddy	cb35277b07	Merge pull request #276 from MichaelDvP/MM10 ... MM10 mixer dat added, fixes #270	2019-12-30 14:48:53 +00: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
Paul	b64c35732e	spelling checks	2019-12-30 14:47:23 +01:00
Paul	f0c7b954a5	SM200 support	2019-12-30 14:47:02 +01:00