Commit Graph

535 Commits

Author SHA1 Message Date
Susis Strolch
a32da99618 txmode2 / Junkers autodetect
* reduce logs in jabber mode
* disable explicit test for Junkers

* add HT3 document
2019-07-29 19:10:19 +02:00
Susis Strolch
e680ae6066 ° fix compile time error in ems.cpp (missing comment)
° show 'echo:telegram' msg only in jabber mode
° fix wrong value when applying 'log j'
2019-07-29 19:10:19 +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 Derbyshire
7ff8cd834d bump to 1.9.0 2019-07-29 13:54:02 +02:00
Paul
f2b3c7b2d7 onlyh show missed bus if logging is enabled 2019-07-28 20:23:13 +02:00
Paul
6baa16667e added MQTT "home/ems-esp/boiler_cmd_flowtemp" 2019-07-27 09:45:38 +02:00
Paul
33bd95c078 replace NULLs with nullptr to be C++11 friendly 2019-07-27 09:45:18 +02:00
Paul
6c32c562f4 1.8.1b24 2019-07-27 09:44:26 +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
caad7c8173 EMS_MAXBUFFERSIZE set to 34 for 2 additional BRKs 2019-07-26 15:16:26 +02:00
Paul
d2a129e5c8 https://github.com/proddy/EMS-ESP/issues/152 2019-07-26 13:00:23 +02:00
Paul
05a11f7c31 typo 2019-07-26 12:52:00 +02:00
Paul
2740866dc4 updated to b23 2019-07-26 12:50:04 +02:00
Paul
eb3cd7da01 added ems_getTxDisabled() 2019-07-26 12:46:11 +02:00
Paul
93c51ad270 ignore bins 2019-07-26 12:45:49 +02:00
Paul
367c73d8fe room temps for RC10 also 2-byte shorts 2019-07-26 12:45:41 +02:00
Paul
99b3125201 bump 2019-07-26 12:44:55 +02:00
Paul
a7065cd24b serial default typo fix 2019-07-25 10:31:33 +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
32e189ec67 https://github.com/proddy/EMS-ESP/pull/154 2019-07-20 10:23:26 +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
3ba81d4e76 delay uart swap until after wifi connected 2019-07-19 16:12:40 +02:00
Paul
0eeb5c8823 support ems+ with read comands 2019-07-19 16:12:28 +02:00
Paul
a1e7b7f999 move commands back to PROGMEM 2019-07-19 16:12:04 +02:00
Susis Strolch
0a700b9451 in ems-esp:setup: set GPIO15 to HIGH so we don't disturb the EMS-Bus during boot 2019-07-19 15:46:18 +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
e2da47afc7 tidy up HA config 2019-07-19 00:05:04 +02:00
Paul
3b986c2e28 https://github.com/proddy/EMS-ESP/issues/153 2019-07-18 23:06:36 +02:00
Susis Strolch
7743ff5d56 add burnStarts, burnWorkMin, heatWorkMin to boiler data set 2019-07-18 16:26:42 +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
Paul
ed25e89780 https://github.com/proddy/EMS-ESP/issues/145 2019-07-17 23:17:45 +02:00
Paul Derbyshire
bac3f53613 minor cleanup 2019-07-16 16:26:30 +02:00
Paul Derbyshire
d5c717c812 added version to firmware filename 2019-07-16 16:25:56 +02:00
Paul Derbyshire
c3bc82cbc8 RC300/3000 rename 2019-07-16 11:38:27 +02:00
Paul Derbyshire
2fd84b2ba4 https://github.com/proddy/EMS-ESP/issues/145 2019-07-16 11:29:20 +02:00
Paul
03106d27c5 updated with v4 pio 2019-07-15 21:34:17 +02:00
Paul Derbyshire
7b6dc38c3d https://github.com/proddy/EMS-ESP/issues/145 2019-07-15 10:54:15 +02:00
Paul Derbyshire
2f4d58bef4 fix typo with DEFAULT_NO_SERIAL 2019-07-08 13:42:45 +02:00
Paul Derbyshire
32b61f67cf telnet works in AP mode, no more automatic web refresh 2019-07-08 11:23:00 +02:00
Paul
61e8f093de ignore n/a values iin mqtt too 2019-07-06 17:14:02 +02:00
Paul
e0f07e52e2 minor changes to web layout 2019-07-06 17:13:46 +02:00
Paul
3d66c5897a https://github.com/proddy/EMS-ESP/issues/146 2019-07-06 16:13:56 +02:00
Paul
9c9f2771fc https://github.com/proddy/EMS-ESP/issues/146 2019-07-05 21:54:21 +02:00
Paul
bfbb1808a7 text changes 2019-07-05 15:36:58 +02:00
Paul
f231c863ec https://github.com/proddy/EMS-ESP/issues/146 2019-07-05 12:17:40 +02:00
Paul
daaed4d5f3 serial on as default and then off even in AP mode 2019-07-05 12:17:34 +02:00
Paul
d190446f0f clean up 2019-07-05 12:17:12 +02:00
Paul
9bc8b3d811 cleanup other devices & SM 2019-07-04 22:59:03 +02:00