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

612 Commits

Author SHA1 Message Date
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
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
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
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 Derbyshire
7b6dc38c3d https://github.com/proddy/EMS-ESP/issues/145 2019-07-15 10:54:15 +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
f231c863ec https://github.com/proddy/EMS-ESP/issues/146 2019-07-05 12:17:40 +02:00
Paul
9bc8b3d811 cleanup other devices & SM 2019-07-04 22:59:03 +02:00
Paul
335692c2ef bump 2019-07-04 22:58:44 +02:00
Paul
6368b12255 https://github.com/proddy/EMS-ESP/issues/144 2019-07-03 22:43:44 +02:00
Paul
18cb01b57f renamed previousSMPublishCRC 2019-07-02 22:46:24 +02:00
Paul
21ae6ebc0d handle rendering of signed shorts nicer 2019-07-01 09:47:29 +02:00
Paul
6fb30c7352 bump 2019-07-01 09:15:14 +02:00
Paul
74abec2591 https://github.com/proddy/EMS-ESP/issues/143 2019-07-01 09:15:06 +02:00
Paul
d37911e954 https://github.com/proddy/EMS-ESP/issues/140 https://github.com/proddy/EMS-ESP/issues/142 2019-06-30 19:56:53 +02:00
Paul
688e194011 minor fixes to SM output 2019-06-29 08:57:28 +02:00
Paul
8a46340979 bump 2019-06-29 08:57:07 +02:00
Paul
b56d775d5d formatting 2019-06-29 08:56:50 +02:00
Paul
1ea9bc0d91 added test 48 for outdoor temp 2019-06-29 08:56:19 +02:00
Vuego123
712e0b3e8c FixedSpacingForSolarPumpTime 
fixed spacing
 2019-06-27 23:26:02 +02:00
Vuego123
55ff267828 AddedISM1SolarPumpWorkingTime 
Added ISM1 Solar Pump Working Time
 2019-06-27 23:07:19 +02:00
Paul
4e50d13bd1 add tx_mode back as new tx code can cause resets 2019-06-26 22:02:16 +02:00
Proddy
a6a03e6485 Merge pull request #137 from Vuego123/SolarLogginOnly&BugfixSolar 
SolarLoggingOnly&Bugfix
 2019-06-26 11:45:21 +02:00
Paul
bdf18b091d support for web server and reset firmware option 2019-06-24 23:40:01 +02:00
Vuego123
9c4e2b5da0 SolarLoggingOnly&Bugfix 
- Added solar only logging option
- Added a callback message to set the setpoint of the maximum solar boiler temperature.
-fixed bug with wrong device_id for solar
 2019-06-23 23:57:57 +02:00
Paul
4b28a1d9b5 add check for max telegram length 2019-06-23 23:55:16 +02:00