andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 16:59:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,413 Commits 5 Branches 25 Tags
807bf4c061c36f4bd10a71b4490c12abed469e7c
Commit Graph

2296 Commits

Author SHA1 Message Date
Paul
72cd2be733 don't validate on RC300 2019-08-17 18:43:44 +02:00
Paul
f08d12c808 text updates to 1.9 beta 2 2019-08-17 15:23:32 +02:00
Paul
ca8750ddab https://github.com/proddy/EMS-ESP/issues/145 2019-08-17 15:06:58 +02:00
Paul
0561de56a4 modify mqtt base help text to show the full prefix 2019-08-17 14:18:39 +02:00
Paul
b6c8fa8331 minor cosmetic updates 2019-08-16 22:23:48 +02:00
Paul
479c69436f updated version to 1.9.0b1 2019-08-16 21:59:52 +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
31327ff7e6 web improvements 2019-08-12 22:54:24 +02:00
Paul
1aac0e35eb text changes 2019-08-11 16:53:05 +02:00
Paul
0f6be3c5b5 pagination in eventlog fix 2019-08-11 12:18:49 +02:00
Paul
3940c935a4 minor comment changes 2019-08-11 12:18:20 +02:00
Paul
85a2884b6a tidy up comments 2019-08-11 12:17:57 +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
7198cd596e turn off LED after reboot check 2019-08-10 22:46:54 +02:00
Paul
ddff71a8af https://github.com/proddy/EMS-ESP/issues/167 2019-08-10 22:06:48 +02:00
Paul
ab20fba4f5 clean up text 2019-08-02 21:30:40 +02:00
Paul
61a4b8dbd8 rename reboot, add more event logging, squished bugs and made some more 2019-08-02 16:08:41 +02:00
Paul
6336315012 default serial off, and trying with 0 delay 2019-08-02 16:07:56 +02:00
Paul
83fef0f87f text changes to html colors 2019-08-02 16:07:28 +02:00
Paul
2bc41408d7 more fancy web stuff 2019-08-02 16:06:54 +02:00
Paul
672033d716 rename 2019-08-02 16:06:01 +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 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
05a11f7c31 typo 2019-07-26 12:52:00 +02:00
Paul
eb3cd7da01 added ems_getTxDisabled() 2019-07-26 12:46:11 +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
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