Commit Graph
1265 Commits
Author SHA1 Message Date
MichaelDvP 1ae7d24bd3 Boiler: sort values, delete doubles, thermostat: add mode to change temp 2020-06-03 12:51:08 +02:00
MichaelDvP 4247633850 don't wait in rx loop 2020-06-02 15:14:59 +02:00
MichaelDvP 3300f1e757 esp8266 uart with irq disabled 2020-06-02 14:01:35 +02:00
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
Paul cfeb1ce291 michael's updates 2020-05-30 14:13:24 +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
Paul c976d330d2 change tx_mode without needing a restart 2020-05-28 23:40:47 +02:00
Paul b4aca3bcb9 more updates 2020-05-28 23:17:25 +02:00
MichaelDvP 5f1d6adaf5 Merge branch 'v2a8' of https://github.com/proddy/EMS-ESP into v2 2020-05-28 08:25:36 +02:00
Paul f807eac26a a9 - roll back uart changes for esp8266 2020-05-26 13:28:23 +02:00
MichaelDvP 55c60365f6 small change 2020-05-26 11:42:28 +02:00
Paul 69646c1a1c a8 2020-05-25 23:18:30 +02:00
Paul d3953d90ca a7 2020-05-25 17:13:05 +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
Paul b2bb8e2b5a a6 2020-05-23 14:00:14 +02:00
Paul 1ceef8afd5 esp32 support 2020-05-19 17:03:00 +02:00
Paul be4f075663 alpha v4 2020-05-18 21:00:38 +02:00
Paul 97ddf80ea8 mixing updates 2020-05-12 18:15:22 +02:00
Paul 3801042ea5 alpha 0.2 - add solar, mixing, heatpump 2020-05-11 23:00:53 +02:00
Paul 30b502a1e4 initial commit 2020-05-08 16:04:53 +02:00
Paul 26b201ea2f 1.9.5 - Merge remote-tracking branch 'origin/dev' 2020-04-30 10:47:55 +02:00
Paul 487cda0841 SM200 energy to 32 bit, fixes #372 2020-04-28 19:02:01 +02:00
Proddy 1a5be8e404 Merge pull request #376 from MichaelDvP/SM_energy
SM200 energy to 32 bit, fixes #372
2020-04-28 18:46:03 +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
Paul 743e09e5f4 render unsigned shorts correctly - #372 2020-04-24 10:41:12 +02:00
Paul 48bcd06e25 merged with PR366 with fixed to RC20 and MM50 2020-04-22 16:25:55 +02:00
Proddy 2eefb7a688 Merge pull request #366 from MichaelDvP/RC20N
new Rc20, fix #361
2020-04-22 16:20:14 +02:00
Proddy e0dd9b4068 Merge branch 'dev' into RC20N 2020-04-22 16:19:51 +02:00
Paul 2f58f88ee3 minor prep for PR merge 2020-04-22 15:58:16 +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
Paul b51d34add0 merge of Yves' "Added retrieving settings (0xA5)" feature 2020-03-23 11:40:48 +01:00
Proddy 2545361984 Merge pull request #352 from ypaindaveine/dev
Added retrieving settings (0xA5) (validated on RC30N), and MQTT cmd t…
2020-03-23 11:30:26 +01:00
Paul 393f920116 minor updates 2020-03-23 11:26:09 +01:00
ypaindaveine 850e3cb65c minor dimension of JSON msg. 2020-03-22 22:29:44 +01:00
ypaindaveine 7253299469 Added retrieving settings (0xA5) (validated on RC30N), and MQTT cmd to set display, building type and language. 2020-03-22 20:02:22 +01:00
Paul 9321b53e40 start topic show datetime #347 #348 2020-03-12 14:35:08 +01:00
Paul f5f2791bcf lowered sel flow temp #344 2020-03-12 14:33:54 +01:00
Paul 6397754a05 more thermostat mode generalization 2020-03-09 18:03:58 +01:00
Paul 37fe454278 use DHW temp instead of boiler temp, removed return temp - #345 2020-03-08 21:49:09 +01:00
Paul c55ed82c30 optimize thermostat modes - #138 2020-03-08 19:41:21 +01:00
Paul b8fb03a5ff use MQTT start topic to show version & IP & boottime - #342 2020-03-07 12:33:27 +01:00