andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-12 18:59:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
565 Commits 5 Branches 25 Tags
479c69436f44edc612fc6a01cc84097b65c8a728
Commit Graph

42 Commits

Author SHA1 Message Date
Paul
31327ff7e6 web improvements 2019-08-12 22:54:24 +02:00
Paul
fc52f05453 1.9.0 web - new implementation 2019-08-02 09:26:13 +02:00
Paul
6baa16667e added MQTT "home/ems-esp/boiler_cmd_flowtemp" 2019-07-27 09:45:38 +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
Vuego123
55ff267828 AddedISM1SolarPumpWorkingTime 
Added ISM1 Solar Pump Working Time
 2019-06-27 23:07:19 +02:00
proddy
dfb3ae856c added support for heatpumps 2019-05-26 17:43:11 +02:00
proddy
7dcf19c59f SM100 changes 2019-05-03 18:42:53 +02:00
proddy
a64dd34379 https://github.com/proddy/EMS-ESP/issues/96 2019-05-03 16:56:28 +02:00
Roland Knall
eecc5f18ee Fixing type in thermostat configuration 2019-04-16 08:32:55 +02:00
proddy
72b82a2326 merged in lobo's code 2019-04-06 11:50:43 +02:00
proddy
d4037fdc34 ems+ merges 2019-04-05 17:59:24 +02:00
Glenn Arens
36494d9e6b Merged changes for the new dev 2019-04-05 12:01:13 +02:00
proddy
b31f3118d1 prepare for ems plujs updates 2019-04-04 21:02:20 +02:00
proddy
b5ae847048 SM10 MQTT support 2019-03-22 17:21:17 +01:00
proddy
e8e1cb8921 added boiler ww comfort., via telnet & MQTT 2019-03-17 17:36:48 +01:00
proddy
4a559866c7 1.6.0 b2 2019-03-17 14:59:37 +01:00
proddy
90b278bbf7 moved shower to settings 2019-03-16 12:50:36 +01:00
proddy
d3885f735d merged in Dallas changes from JewelZB 2019-03-15 21:12:00 +01:00
proddy
412ed2fa16 added Moduline 1010 2019-03-11 21:22:08 +01:00
proddy
8e62a99417 1.5.7b 2019-03-10 15:09:51 +01:00
Glenn Arens
a94b88ad9e Added print messages and got temperature setpoitn working 2019-03-07 20:39:50 +01:00
proddy
541c0c2e10 1.5.5 2019-03-07 08:29:20 +01:00
proddy
a1b8bf049d typo 2019-03-03 17:19:16 +01:00
proddy
937b7526cb 1.5.4 2019-03-03 13:26:11 +01:00
proddy
5e228a74e8 Merge branch 'master' of https://github.com/proddy/EMS-ESP-Boiler 2019-02-23 14:58:23 +01:00
proddy
e3807afc23 1.5.3 2019-02-23 14:58:09 +01:00
Evgenii Grekov
4a810bb829 set boiler wwtemp via MQTT 2019-02-22 15:01:26 +05:00
proddy
a0303f0704 1.5.2 2019-02-04 21:44:13 +01:00
proddy
83bad9dbaa release 1.5.0 2019-02-03 20:44:15 +01:00
proddy
f6550b45e4 version 1.4.1 2019-01-29 22:48:38 +01:00
proddy
d2618bfcdb version 1.3.2. See changelog 2019-01-23 20:30:36 +01:00
Derbyshire
7c71096e38 MQTT retain to false 2019-01-16 23:44:01 -02:00
proddy
6e3312c772 added MQTT will topic & payload 2019-01-12 18:56:10 +01:00
Proddy
b51018c43a Merge pull request #33 from SpaceTeddy/master 
RC35: MQTT day/night/auto mode; sets setpoint temperature in type 0x3D depends on current night/day Mode
 2019-01-12 14:47:15 +01:00
proddy
408fb9ebf5 release 1.3.1 2019-01-12 14:13:53 +01:00
Christian Weithe
5cda8a5444 - RC35: sets setpoint temperature in type 0x3D depends on current 2019-01-10 22:29:45 +01:00
proddy
22823545da version 1.3.0 2019-01-09 23:41:41 +01:00
proddy
23599fb0a9 version 1.2.3. See ChangeLog 2019-01-03 15:10:52 +01:00
proddy
e14c2c658c version 1.2.0. See ChangeLog 2019-01-02 00:14:36 +01:00
proddy
b52794998e Version 1.1. See ChangeLog 2018-12-22 16:00:26 +01:00
proddy
13603d63c6 small improvements 2018-12-11 22:39:06 +01:00
proddy
b01a411dd3 moved custom settings to my_config.h 2018-12-09 12:36:41 +01:00