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

804 Commits

Author SHA1 Message Date
Paul
4ccec0a6f3 1.8.1 2019-06-17 21:29:49 +02:00
Vuego123
1872a0d57a Added extra values for ISM1 
Add measures for energy production (in Wh) and solar pomp (on/off)
 2019-06-16 15:56:18 +02:00
Paul
70972ccf6a preparing for next 1.9.0dev 2019-06-15 15:53:06 +02:00
Paul
3766780cab version 1.8.0 final 2019-06-15 15:24:56 +02:00
Paul
011771a746 added comment 2019-06-15 12:36:54 +02:00
Paul
cbeadd19c0 bump 2019-06-15 12:36:46 +02:00
Proddy
332461c1de Merge pull request #130 from Vuego123:bugfix-FR10-&-FW100-wrong-temp.-divider 
FW100 & FR10 fixed wrong temperature divider
 2019-06-11 22:28:41 +02:00
Paul
40659df6be optimize Tx to handle phantom brk 2019-06-11 22:27:46 +02:00
Paul
c85e9d756b bump 2019-06-11 22:27:32 +02:00
Paul
08c4a11ac8 update text 2019-06-11 22:25:59 +02:00
Vuego123
c3ab74862d FW100 & ISM1 fixed wrong temperature divider 2019-06-11 00:43:27 +02:00
Paul
68091b8042 https://github.com/proddy/EMS-ESP/issues/117 2019-06-10 12:30:00 +02:00
Paul
4ee2cc0f6c improved crash detection 2019-06-09 22:12:38 +02:00
Paul
58a244ab2a clear list on autodetect 2019-06-08 22:35:37 +02:00
Paul
b3bdcd2228 merged Junkers FW100 & ISM1 2019-06-08 17:22:22 +02:00
Proddy
25f79fb0ad Merge pull request #121 from Vuego123:Added-Solar-Module-Junkers-ISM1 
Solar Module Junkers ISM1
 2019-06-08 17:20:05 +02:00
Paul
fcce0f6f72 Merge branch 'dev' of https://github.com/proddy/EMS-ESP-Boiler into dev 2019-06-08 17:18:50 +02:00
Paul
4b7db73e74 cosemtic changes 2019-06-08 17:18:38 +02:00
Proddy
7fc1616066 Merge pull request #128 from Vuego123:Added-Thermostat-Junkers-FW100 
Added support for Junkers FW100
 2019-06-08 17:16:20 +02:00
Vuego123
ada33d6585 Added support for Junkers FW100 
Added FW100 device id,
Added FW100 support to the FR10 (+renamed to Junkers Status message)
Added callback method and improved showInfo and PublishValues in ems-esp.cpp
 2019-06-05 23:31:34 +02:00
proddy
1d10d98fd5 philrich fix for junkers https://github.com/proddy/EMS-ESP/issues/103#issuecomment-498187147 2019-06-05 22:36:15 +02:00
proddy
c56cdf16d8 bump 2019-06-05 22:35:25 +02:00
proddy
f0cf3b8b70 new devices 2019-06-05 22:35:16 +02:00
Vuego123
51f8b55fe8 Solar Module Junkers ISM1 
Added support to read collector temperature and solar boiler temperature for Solar Module Junkers ISM1
 2019-06-01 23:42:30 +02:00
proddy
17a75fb06e fix tapwater off 2019-05-28 21:15:57 +02:00
proddy
c3427be109 detect junkers on startup 2019-05-28 19:39:25 +02:00
proddy
b869bc1d75 detect junkers on startup 2019-05-28 11:57:04 +02:00
proddy
2b494d8bc8 bump 2019-05-27 22:14:07 +02:00
proddy
4d974bbfa0 set emsReverse if a Junkers heatronic is detected 2019-05-27 22:13:37 +02:00
proddy
16fc383a40 fix to tx_mode 2019-05-27 14:40:26 +02:00
Susis Strolch
fdebf6bbdf tx_mode=2: compensate phantom BRK 2019-05-27 12:47:06 +02:00
Susis Strolch
078f89ce7e Merge branch 'dev' of https://github.com/proddy/EMS-ESP-Boiler into dev 
* 'dev' of https://github.com/proddy/EMS-ESP-Boiler:
  heatpump minor changes
 2019-05-27 10:53:07 +02:00
proddy
1bea0d9f62 heatpump minor changes 2019-05-27 10:12:36 +02:00
Susis Strolch
5479313e53 smart-tx - tx_mode 2 solved 
after sending the byte we wait until we receive the busmaster response.
sending the BRK is done in loopback mode.
Only caveat: we will get a phantom \0 in Rx FIFO
 2019-05-27 10:08:01 +02:00
proddy
45741c7744 https://github.com/proddy/EMS-ESP/issues/117 2019-05-26 17:57:35 +02:00
proddy
dfb3ae856c added support for heatpumps 2019-05-26 17:43:11 +02:00
proddy
4651987da8 tx_mode = tx_delay 2019-05-26 15:56:00 +02:00
proddy
1d7310411f merge Junkers Tx logic 2019-05-26 12:23:50 +02:00
proddy
9ce1a5b488 poll from milli to micro secs for better accuracy 2019-05-25 11:21:13 +02:00
proddy
6995516ce0 fixed trailing ; in Tx 2019-05-25 10:24:11 +02:00
proddy
9cdd9c403c https://github.com/proddy/EMS-ESP/issues/103#issuecomment-495605798 2019-05-24 15:30:21 +02:00
proddy
1a638d2611 tx logic 2019-05-24 15:08:56 +02:00
proddy
c6a6dca81a empty rx fifo after Tx BRK 2019-05-24 12:28:23 +02:00
proddy
df34e296a3 tx logic "take two" 2019-05-24 11:39:38 +02:00
proddy
a555641ba3 EMS Tx del 2019-05-24 10:06:42 +02:00
proddy
dfbb804887 disabled tx code for mode 2 until we've fixed it 2019-05-24 09:23:18 +02:00
proddy
66ec810ea1 susisstrolch's Tx "take two" mod 2019-05-23 14:52:34 +02:00
proddy
57442db11c small changes 2019-05-22 18:48:27 +02:00
proddy
03d9e6547f txDelay change from bool to int 2019-05-22 00:01:59 +02:00
proddy
f9c5cb9dca merged Tx Delay https://github.com/proddy/EMS-ESP/pull/113 2019-05-21 23:50:47 +02:00