andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,044 Commits 5 Branches 25 Tags
ce97c5582282fc9938fb019e1a500cb56fab5c7f
Commit Graph

1044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul
ce97c55822 fix for bosch boiler temp #314 and MM10 on HC2 #270 2020-01-31 11:09:58 +01:00
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
Paul
656bb9521d tidy up 2020-01-31 00:06:32 +01:00
Proddy
97343c3998 Merge pull request #315 from MichaelDvP/MM10 
MM200 added (#299)
 2020-01-30 20:48:32 +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
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