Commit Graph

165 Commits

Author SHA1 Message Date
Paul Derbyshire
2a2a50b8c3 tidy up includes 2019-07-29 22:40:33 +02:00
Paul Derbyshire
cb2427b75e write to ems+ thermostats (https://github.com/proddy/EMS-ESP/issues/145) 2019-07-29 22:38:55 +02:00
Paul
f2b3c7b2d7 onlyh show missed bus if logging is enabled 2019-07-28 20:23:13 +02:00
Paul
33bd95c078 replace NULLs with nullptr to be C++11 friendly 2019-07-27 09:45:18 +02:00
Paul
367c73d8fe room temps for RC10 also 2-byte shorts 2019-07-26 12:45:41 +02:00
Paul
cac7bfae31 force serial off 2019-07-25 10:30:34 +02:00
Paul
3fdd086160 https://github.com/proddy/EMS-ESP/issues/156 2019-07-22 20:06:22 +02:00
Paul
f8aabd9bf8 merged in https://github.com/proddy/EMS-ESP/pull/154 from @susisstrolch 2019-07-20 10:22:47 +02:00
Paul
0eeb5c8823 support ems+ with read comands 2019-07-19 16:12:28 +02:00
Susis Strolch
5587b9d267 reworks because of 'tx_mode 2' and protocol issues
° added markers (GIO12, GPIO14) for logic analyzer debugging

° change UART initialisation
  - set RxFIFO full to 1 char, so we can detect active telegram on EMS-Bus
  - set RxTOT to 1 char for the same reason

° in ems_parseTelegram: ignore telegram if  emsRxStatus != EMS_RX_STATUS_IDLE
  because we missed to respond in a timely manner

° ems_tx_buffer is not void anymore, instead we return the Tx status
° extended the emsTxStatus
  - EMS_TX_WTD_TIMEOUT: timeout while waiting for echo of last Tx byte
    out telegram was ignored by the bus master, so the byte wasn't echoed
  - EMS_TX_BRK_DETECT:  BRK detected while sending the telegram
    bus master send us a break because of protocol violation

° add burnStarts, burnWorkMin and heatWorkMin to MQTT boiler message

TODO:
  + take care of ems_tx_buffer return code
  + accept direct telegram in ems_parse_telegram and do a proper acknowledge
  + split the heartbeat in static (version, IP-address) and dynamic (RSS etc)
  + change the hearbeat to a JSON structure so we can easier pick the uptime
2019-07-19 13:16:23 +02:00
Paul
80a9c98658 auto get temps from RC300/3000 2019-07-19 00:23:10 +02:00
Paul
ed25e89780 https://github.com/proddy/EMS-ESP/issues/145 2019-07-17 23:17:45 +02:00
Paul Derbyshire
7b6dc38c3d https://github.com/proddy/EMS-ESP/issues/145 2019-07-15 10:54:15 +02:00
Paul
f231c863ec https://github.com/proddy/EMS-ESP/issues/146 2019-07-05 12:17:40 +02:00
Paul
9bc8b3d811 cleanup other devices & SM 2019-07-04 22:59:03 +02:00
Vuego123
55ff267828 AddedISM1SolarPumpWorkingTime
Added ISM1 Solar Pump Working Time
2019-06-27 23:07:19 +02:00
Paul
4e50d13bd1 add tx_mode back as new tx code can cause resets 2019-06-26 22:02:16 +02:00
Proddy
a6a03e6485 Merge pull request #137 from Vuego123/SolarLogginOnly&BugfixSolar
SolarLoggingOnly&Bugfix
2019-06-26 11:45:21 +02:00
Paul
bdf18b091d support for web server and reset firmware option 2019-06-24 23:40:01 +02:00
Vuego123
9c4e2b5da0 SolarLoggingOnly&Bugfix
- Added solar only logging option
- Added a callback message to set the setpoint of the maximum solar boiler temperature.
-fixed bug with wrong device_id for solar
2019-06-23 23:57:57 +02:00
Paul
0b0f65c841 auto formatting 2019-06-20 09:30:42 +02:00
Vuego123
b984b9e3d8 SplitSolarModuleFromOtherDevices
Solar modules upgrades: a separate Solar Module types list (no longer part of other devices). Made a separate _EMS_SolarModule class (no longer part of _EMS_Other). And updated all code that was impacted by that change.
Also added a device description for solar modules.
Tests on my setup (telnet & MQTT) work as before.
2019-06-20 00:16:34 +02:00
proddy
f320095034 fix rendering for unset SM values 2019-06-19 14:41:05 +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
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
40659df6be optimize Tx to handle phantom brk 2019-06-11 22:27:46 +02:00
Paul
68091b8042 https://github.com/proddy/EMS-ESP/issues/117 2019-06-10 12:30:00 +02:00
Paul
58a244ab2a clear list on autodetect 2019-06-08 22:35:37 +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
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
4d974bbfa0 set emsReverse if a Junkers heatronic is detected 2019-05-27 22:13:37 +02:00
proddy
1bea0d9f62 heatpump minor changes 2019-05-27 10:12:36 +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
df34e296a3 tx logic "take two" 2019-05-24 11:39:38 +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
Susis Strolch
93b6b1ea4c smart tx - try to fix Tx problems
- fix typo - replace emsaurt_tx_poll by emsuart_tx_poll
- smart tx - enabled by EMS_Sys_Status.emsTxDelay == 2
  use loopback to send in burst mode
- change emsuart_tx_poll to use emsuart_tx_buffer
- encapsulate uart_swap in #ifndef NO_UART_SWAP (private use)
2019-05-21 22:50:26 +02:00
proddy
ad0ee185ef memory optimizations, strings to flash mem 2019-05-09 22:35:09 +02:00