andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 21:54:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,262 Commits 6 Branches 30 Tags
ba08fb65ef218ea44fa22c7638422d4f84acc66d
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP ba08fb65ef Typos, version string 2020-06-01 14:39:59 +02:00
MichaelDvP 19abeb7456 Merge branch 'v2 a11' of https://github.com/proddy/EMS-ESP into v2 2020-05-31 14:07:17 +02:00
MichaelDvP f6854b8ad4 esp32 uart timing, RC35 thermostat mqtt enhancement, fix type_id display 2020-05-31 09:28:41 +02:00
MichaelDvP bf5172eefb Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 
esp32 uart
 2020-05-29 16:06:10 +02:00
MichaelDvP 348df3e96f uart and some small fixes 2020-05-29 12:20:26 +02:00
MichaelDvP f73c3b01d7 Merge branch 'v2'a9 of https://github.com/proddy/EMS-ESP into v2 2020-05-29 12:06:01 +02:00
MichaelDvP 5f1d6adaf5 Merge branch 'v2a8' of https://github.com/proddy/EMS-ESP into v2 2020-05-28 08:25:36 +02:00
MichaelDvP 55c60365f6 small change 2020-05-26 11:42:28 +02:00
MichaelDvP 91f8afd3b1 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-05-25 11:58:03 +02:00
MichaelDvP 4d5e512952 esp32 uart and wemos d1-mini32 2020-05-25 08:45:09 +02:00
MichaelDvP 0f2b4b27b9 add _setValue32() for energy-values 2020-04-27 13:38:13 +02:00
MichaelDvP d284a3c1b8 solar energy values changed to 32bit 2020-04-26 17:48:48 +02:00
MichaelDvP 0e750d44a0 mqtt temperature pushback, read seltemp on RC35, MM50 fix, use first found thermostat 2020-04-19 15:47:52 +02:00
MichaelDvP 4c6410d9ba rename RC20StatusMessage3 to RC20NStatusMessage 2020-04-09 11:08:04 +02:00
MichaelDvP 32e3e64b4a add bin-file 2020-04-09 09:56:09 +02:00
MichaelDvP ff1b45fd8b add new RC20 thermostat (messages 0xAD, 0xAE) 2020-04-09 09:52:14 +02:00
MichaelDvP 14e4c6f2a3 revert back subscription of only active heating circuits 2020-02-01 14:36:15 +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
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
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 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
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
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
MichaelDvP 4be2383ad8 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-09 10:22:36 +01:00
MichaelDvP 13e87bab97 Merge remote-tracking branch 'upstream/dev' into MM10 2020-01-05 10:49:07 +01:00
MichaelDvP 0537705924 Fix unknown device 2020-01-04 16:05:21 +01:00
MichaelDvP 95b65269e5 merged with dev 1.9.5b12 2020-01-04 14:52:17 +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
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
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
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
MichaelDvP 5091ce02c2 Merge remote-tracking branch 'upstream/dev' into MM10 2019-12-30 15:03:37 +01:00
MichaelDvP a22e64a8ca MM10 mixer added, changed WWDesired to WWDesinfection, added boier exhaust temperature 2019-12-30 13:35:23 +01:00