Commit Graph

216 Commits

Author SHA1 Message Date
MichaelDvP
14e4c6f2a3 revert back subscription of only active heating circuits 2020-02-01 14:36:15 +01:00
Paul
4cc237bcc3 typo in thermostat text 2020-02-01 09:07:29 +01:00
Paul
cb23193359 text formatting changes 2020-01-31 22:44:13 +01:00
Paul
80a7f47565 formatting 2020-01-31 00:08:14 +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
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
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
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
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
Paul
46f32682f0 don't show boiler details if it isnt connected 2020-01-07 22:03:31 +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
a8aa5e4f7f merge with proddy dev branch 2020-01-02 09:43:26 +01:00
MichaelDvP
dcbccc8604 MM10 assigned to HC2 2020-01-01 18:35:54 +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
ca5912ddbd codacy/lint warnings 2019-12-31 11:48:20 +01:00
Paul
75b47c1609 force autodetect after changing thermostat - #238 2019-12-30 20:48:03 +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
990d654920 added comment 2019-12-23 20:28:42 +01:00
Paul
33d930b7cd fixes for #263, MQTT flooding, 2019-12-20 14:53:12 +01:00
proddy
a0e265c119 fixes to publish_time 2019-12-16 17:03:21 +01:00
Paul
70db69403f added back boiler starts and workmin to MQTT 2019-12-10 08:21:00 +01:00
Paul
b82b0b2373 remove shower from info 2019-12-08 09:21:35 +01:00
Paul
e9ba4991b3 refactor publish_time - https://github.com/proddy/EMS-ESP/issues/253 2019-12-06 20:28:51 +01:00
proddy
e6556557cf fix publish_time to always send when it has a 0 value 2019-11-29 20:37:19 +01:00
Paul
a04b2ff708 prep for syslog 2019-11-19 23:11:26 +01:00
Paul
4d8bc392a0 extra check for command "log w" 2019-11-17 19:28:22 +01:00
proddy
4a56f0dc9f added log w and more ems+ messages 2019-11-14 23:13:47 +01:00
Paul
b56e12f33e added outdoor temp 0xD1 - https://github.com/proddy/EMS-ESP/issues/220 2019-11-13 22:22:51 +01:00
Paul
ae5290131d optimzed how device descriptions are read 2019-11-13 10:21:44 +01:00
proddy
9e3f5700e1 code optimizations on EMS device library 2019-11-11 23:54:59 +01:00
proddy
8e66fa81e3 publish any thermostat mode to MQTT 2019-11-09 18:13:08 +01:00
proddy
4450b50aae removed publish_always, change how publish_time works 2019-11-09 11:59:43 +01:00