andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-14 22:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
973 Commits 6 Branches 30 Tags
6a2fd4402849f2d42e8358e2cc906435388e76c2
Commit Graph
973 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Paul 52a82277e9 1.9.5b5 2019-12-30 14:46:26 +01:00
Paul a3faf2cf18 SM200 support 2019-12-30 14:46:08 +01:00
MichaelDvP a22e64a8ca MM10 mixer added, changed WWDesired to WWDesinfection, added boier exhaust temperature 2019-12-30 13:35:23 +01:00
proddy f27088c035 fix for sieger, typo in devices library - #266 2019-12-26 17:34:37 +01:00
proddy 3002e0dfac rollback MQTT last will change 2019-12-24 08:09:21 +01:00
Paul 990d654920 added comment 2019-12-23 20:28:42 +01:00
Paul 1a2c58d9a8 take only boilTemp from 0x18 Fast telegrams 2019-12-23 20:28:26 +01:00
Paul 591bc7c119 bump 2019-12-23 20:27:58 +01:00
Paul 35f3a291be disable MQTT last will. dont think anyone was using it 2019-12-23 20:27:51 +01:00
proddy b5eebea6a1 remove MM400 #262 2019-12-23 16:18:10 +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 2e9c1b76ea 1.9.5 beta prep 2019-12-15 23:20:45 +01:00
Paul a5fedbf1ba redo websocket mem fix - #250 and #258 2019-12-11 10:14:23 +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 e211eb3bd5 bump b23 2019-12-08 09:09:13 +01:00
Paul 6fb99132ff fix fetching setpoint temps from RC300 (using single bytes) 2019-12-08 09:08:52 +01:00
Paul 9b31e3f60a formatting 2019-12-08 09:08:27 +01:00