Commit Graph

188 Commits

Author SHA1 Message Date
proddy
4a56f0dc9f added log w and more ems+ messages 2019-11-14 23:13:47 +01:00
Paul
81af418294 code formatting 2019-11-13 10:22:46 +01:00
Paul
ae5290131d optimzed how device descriptions are read 2019-11-13 10:21:44 +01:00
Paul
cb09041279 mem debugging 2019-11-12 08:50:31 +01:00
proddy
9e3f5700e1 code optimizations on EMS device library 2019-11-11 23:54:59 +01:00
proddy
26b8185f56 keep thermostat generic, and remove HA's heat mode 2019-11-05 18:21:13 +01:00
proddy
9f146768b4 made all doubles to floats 2019-11-04 19:16:07 +01:00
Paul
6275245b03 timezone support 2019-11-01 15:04:17 +01:00
Paul
0bb598efe7 added Greenstar i 2019-10-29 18:03:08 +01:00
Christian Weithe
c62502052d RC20RF tap water one time loading function 2019-10-28 19:26:29 +01:00
Paul
9835ddb127 added MM200 and Junkers Cerapur Top - https://github.com/proddy/EMS-ESP/issues/222 2019-10-27 15:04:18 +01:00
Paul
0ac4ad3f37 tidy up telnet messages 2019-10-18 15:19:26 +02:00
Paul
f39ecb860a remove emsuart debug messages 2019-10-14 18:25:12 +02:00
Paul
d3009495c7 changes to MQTT topics 2019-10-12 13:12:00 +02:00
proddy
1f1cd789ce https://github.com/proddy/EMS-ESP/issues/205 - product ID 95 is not unqiue to Junkers! 2019-10-10 14:23:47 +02:00
Klaudiusz Staniek
0419e20592 Added pump modulation and valve status 2019-10-06 22:14:48 +02:00
Paul
a5719800a3 code cleanup, thermostat mqtt changes, dallas sensor to 2 precision doubles 2019-10-06 21:55:28 +02:00
Klaudiusz Staniek
94844651b9 MM100 EMS_TYPE_MMPLUSStatusMessage added 2019-10-06 19:11:46 +02:00
Klaudiusz Staniek
2a8ed4d64f Add switch temperature 2019-10-06 11:36:30 +02:00
Paul
c798b5e16a show device even if its active during scan 2019-10-04 13:57:19 +02:00
Paul
f55fa090c7 added Buderus Logano, BC40, SM50 2019-10-03 21:54:12 +02:00
Paul
bb2d490626 test for junkers detection - https://github.com/proddy/EMS-ESP/issues/103 2019-10-02 23:50:25 +02:00
Paul
1aace72255 added 'autodetect quick' option 2019-09-30 23:19:21 +02:00
Paul
a5ceaa0edd fix for duplicate device IDs 2019-09-30 23:01:11 +02:00
Paul
34ad46427c allow duplicate EMS devices during detection (thanks @kstaniek) 2019-09-30 22:02:06 +02:00
Paul
4b4ef4b426 modifications for RC35 temps - https://github.com/proddy/EMS-ESP/issues/162 2019-09-27 14:35:23 +02:00
Paul
92d6337876 tx_mode changes for EMS+ 2019-09-25 21:49:12 +02:00
Paul
c8108101ef code cpplint optimizations 2019-09-23 20:18:08 +02:00
Paul
82c0273ba0 typo with devicemap 2019-09-20 12:26:37 +02:00
Paul
155536af3c added type 0x07 to detect whats on the EMS bus 2019-09-19 22:54:59 +02:00
Paul
2beb5cd5f3 support for multiple HCs - https://github.com/proddy/EMS-ESP/issues/162 2019-09-07 18:59:32 +02:00
Paul
44d45d221a added model types for web colouring 2019-08-31 12:19:11 +02:00
Paul
bbbb9f13ec add tx_mode back 2019-08-30 23:57:08 +02:00
Paul
f7aaa69408 more EMS+ RC3000 handling 2019-08-29 23:17:56 +02:00
Paul
2b20e182ca store ems plus type (FF, F7, F9) 2019-08-27 22:49:22 +02:00
Paul
6274990353 ems+ updates 2019-08-22 21:18:31 +02:00
Paul
2aae90b7cf removed timezone, handled via JS 2019-08-20 19:02:01 +02:00
Paul
e8c95664d2 comment update 2019-08-18 23:13:55 +02:00
Paul
2dc01d78c4 merge with txmode2 branch 2019-08-11 10:56:41 +02:00
Paul
7997804ed3 merge with txmode2 branch 2019-08-11 10:56:30 +02:00
Paul
83fef0f87f text changes to html colors 2019-08-02 16:07:28 +02:00
Paul
fc52f05453 1.9.0 web - new implementation 2019-08-02 09:26:13 +02:00
Susis Strolch
6dba02603f Merge branch 'dev' of https://github.com/proddy/EMS-ESP-Boiler into txmode2
* 'dev' of https://github.com/proddy/EMS-ESP-Boiler:
  tidy up includes
  write to ems+ thermostats (https://github.com/proddy/EMS-ESP/issues/145)
2019-07-31 10:44:52 +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
Susis Strolch
dab66ce918 fixing tx_mode 2
° stabilize emsuart_rx...
  We can get more than 32 bytes because of the trailing BRK.
  So the buffersize for Rx interrupt is (for safety) increased to 36 bytes.
  If length exceeds 36 bytes we dump them to /dev/null

° reintroduced the phantomBreak flag again
  We _must_ signal to Rx that we have a double break, otherwise
  we get problems in emsuart_recvTask...

° add ems_dumpBuffer which shows TxBuffer before send and RxBuffer after
  receive and applying phantomBreak.
  The dump is activated in "log j" mode and used to debug the
  protocol problems.

° change handling of ID bit 7
  on system start we listen for telegram until we receive a valid one,
  larger than 5 byte.
  Depending on the bit7 of the source address we decide if we have a
  Buderus EMS or a Junkers EMS bus.
  This decision is used to set the variables emsIDMask (0x00 for Buderus,
  0x80 for Junkers) and the emsPollAck buffer, used to send the propper
  acknowledge, depending on EMS type.

° move poll acknowledge function (emsuart_tx_poll) from emsuart.cpp to ems.cpp
  and rename to ems_pollAck

° add EMS_TX_REV_DETECT status for detecting the SourceID.7 bit and setting
  emsIDMask and emsPollAck buffer accordingly

° set initial emsTxStatus to EMS_TX_REV_DETECT

° add 'log j' - jabber - for more extensive debug logs
2019-07-29 19:10:19 +02:00
Paul
93ac421d2f added clang-format around code sections to prevent defines getting screwed with autoformat 2019-07-26 15:19:29 +02:00
Paul
eb3cd7da01 added ems_getTxDisabled() 2019-07-26 12:46:11 +02:00
Paul
f8aabd9bf8 merged in https://github.com/proddy/EMS-ESP/pull/154 from @susisstrolch 2019-07-20 10:22:47 +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
Susis Strolch
7d361061c6 add marker pins (GPIO12, GPIO14) for logic analyser
° use faster macros for LA markers
2019-07-18 11:26:43 +02:00