andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,051 Commits 5 Branches 25 Tags
14e4c6f2a3855502aaa12d7d35933d0e20ecd6b0
Commit Graph

216 Commits

Author SHA1 Message Date
Paul
9b16354c8a always send thermostat MQTT even if there is not current temp detected 2019-09-27 19:58:20 +02:00
Paul
183d845597 show MQTT subscribes at boot 2019-09-27 19:53:45 +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
814f477cf9 quick adjustment to MQTT HC - 1549cf5e75 2019-09-27 10:19:10 +02:00
Paul
1549cf5e75 fix bug in MQTT HC 2019-09-26 21:29:10 +02:00
Paul
a6ca016015 fix for "heat" https://github.com/proddy/EMS-ESP/issues/190 2019-09-25 22:40:49 +02:00
Paul
92d6337876 tx_mode changes for EMS+ 2019-09-25 21:49:12 +02:00
Paul
e546f34a3e fix for https://github.com/proddy/EMS-ESP/issues/190 - MQTT not working for multiple HCs 2019-09-25 21:14:06 +02:00
Paul
c8108101ef code cpplint optimizations 2019-09-23 20:18:08 +02:00
Paul
6c52e8a364 fix for https://github.com/proddy/EMS-ESP/issues/182 2019-09-21 10:50:23 +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
e246f2a35c fixes for showing HCs 2019-09-19 22:55:16 +02:00
Paul
fc06222171 mention jabber mode in settings 2019-09-16 22:41:20 +02:00
Paul
53b68944fb JSON settings is fixed 2019-09-16 21:56:38 +02:00
Paul
a738251b70 MQTT support for handling multiple Heating Circuits 2019-09-14 16:37:06 +02:00
Paul
ca65ac0677 remove heating_circuit 2019-09-14 10:35:47 +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
41d9407cc9 tx_mode defaults to 1 (not 0) 2019-09-04 16:26:31 +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
d71dbbbd21 minor changes 2019-08-29 23:18:40 +02:00
Paul
ab73ea1c73 add button to force fetch NTP time 2019-08-27 22:49:00 +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
85a2884b6a tidy up comments 2019-08-11 12:17:57 +02:00
Paul
7997804ed3 merge with txmode2 branch 2019-08-11 10:56:30 +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
6336315012 default serial off, and trying with 0 delay 2019-08-02 16:07:56 +02:00
Paul
fc52f05453 1.9.0 web - new implementation 2019-08-02 09:26:13 +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
6baa16667e added MQTT "home/ems-esp/boiler_cmd_flowtemp" 2019-07-27 09:45:38 +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
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
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
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 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
61e8f093de ignore n/a values iin mqtt too 2019-07-06 17:14:02 +02:00