Commit Graph

304 Commits

Author SHA1 Message Date
Paul
6f926d965a bug in thermostat day mode with RC3000 2019-09-23 09:58:01 +02:00
Paul
6c52e8a364 fix for https://github.com/proddy/EMS-ESP/issues/182 2019-09-21 10:50:23 +02:00
Paul
842b8adc40 extra check in calculating CRC 2019-09-20 16:52:53 +02:00
Paul
a7c409c734 small improvements in listen mode 2019-09-20 14:19:16 +02:00
Paul
5b39783a3a text changes 2019-09-20 12:46:45 +02:00
Paul
489fdf452e minor changes 2019-09-20 12:27:21 +02:00
Paul
155536af3c added type 0x07 to detect whats on the EMS bus 2019-09-19 22:54:59 +02:00
proddy
e3190686fc set HC to active for RC35 - https://github.com/proddy/EMS-ESP/issues/162 2019-09-18 18:12:36 +02:00
proddy
111c1a0b42 ignore empty HC1 telegrams 2019-09-18 16:39:39 +02:00
proddy
84baf35a72 HC optimization for RC35 2019-09-18 16:37:09 +02:00
proddy
c2ddef85ad ignore HC empty values - https://github.com/proddy/EMS-ESP/issues/162 2019-09-18 16:33:08 +02:00
Paul
b3d003c468 fix bug in HC counter for https://github.com/proddy/EMS-ESP/issues/162 2019-09-17 20:12:24 +02:00
Paul
a738251b70 MQTT support for handling multiple Heating Circuits 2019-09-14 16:37:06 +02:00
proddy
3f9a3bfc64 https://github.com/proddy/EMS-ESP/issues/180 2019-09-12 17:57:41 +05:30
Paul
2beb5cd5f3 support for multiple HCs - https://github.com/proddy/EMS-ESP/issues/162 2019-09-07 18:59:32 +02:00
Paul
9fa10aaf8f removed tx_delay 2019-09-05 21:53: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
dee620cd52 https://github.com/proddy/EMS-ESP/issues/145 handle read/write EMS+ correctly 2019-08-20 23:18:54 +02:00
Paul
bc1c593543 more pretty changes in web and wording 2019-08-20 21:12:34 +02:00
Paul
9dfeba54e9 fix showing data len on send and also show CRC with raw (minor cosmetic changes) 2019-08-18 23:14:36 +02:00
Paul
72cd2be733 don't validate on RC300 2019-08-17 18:43:44 +02:00
Paul
ca8750ddab https://github.com/proddy/EMS-ESP/issues/145 2019-08-17 15:06:58 +02:00
Paul
ae766b09e1 added mqtt log 2019-08-16 21:49:52 +02:00
Paul Derbyshire
e12fa66462 tests 2019-08-13 19:39:28 +02:00
Paul
3940c935a4 minor comment changes 2019-08-11 12:18:20 +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
ab20fba4f5 clean up text 2019-08-02 21:30:40 +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
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
Susis Strolch
573ebcffeb txstatus: remove all references and settings 2019-07-29 21:35:22 +02:00
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
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