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

1651 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Wagner
5e938a3f29 * add Heat exchanger temperature 
* add cylinder primary pump modulation when using an external heat exchanger
* make all solar mqtt names consistently camelCase
* add comments and sensor shortnames according to english MS200 documentation
 2020-08-04 17:49:41 +02:00
Johannes Wagner
7fee545cb6 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-08-04 17:44:05 +02:00
Proddy
56c4e043fe Merge pull request #448 from MichaelDvP/v2 
V2 sensor fix esp32
 2020-08-03 10:40:47 +02:00
MichaelDvP
6df1f3f708 thermostat allow master, snc commands 2020-08-03 07:51:48 +02:00
MichaelDvP
91573f5594 onewire for esp32 improved, retry for sensors 2020-08-02 08:54:30 +02:00
Proddy
277f12197c Merge pull request #446 from MichaelDvP/v2 
V2
 2020-08-02 08:07:29 +02:00
MichaelDvP
e735ac0338 update readme (add mqtt) 2020-08-01 12:20:55 +02:00
MichaelDvP
d2549d025b add thermostat values, change output thermostat mqtt-custom to single format 2020-08-01 12:20:16 +02:00
MichaelDvP
bbc40e5bfb add solar values 2020-08-01 12:19:01 +02:00
MichaelDvP
2936de3e3f add boler values 2020-08-01 12:18:20 +02:00
MichaelDvP
d6c5321a5f update uarts 2020-08-01 12:17:31 +02:00
MichaelDvP
6a434f0cef round sensor values, no yield for esp32 (dualcore) 2020-08-01 12:14:49 +02:00
MichaelDvP
7ca593f374 enlarge json buffer to hold sensor and boiler values 2020-08-01 12:12:42 +02:00
proddy
163fbba917 2.0.0b11 - with flow/max/min boiler temps - #59 2020-07-31 16:08:58 +02:00
proddy
09895bb461 clean-up code 2020-07-31 13:59:40 +02:00
proddy
4fc6797f4e rename collector - #267 2020-07-31 13:59:32 +02:00
proddy
1d3a31b9f3 show external dallas temp sensors in web UI 2020-07-31 13:59:06 +02:00
proddy
34f7796bd8 add NTP service, only for ESP32 2020-07-31 13:58:20 +02:00
proddy
11fe8e71b4 bump to b10 2020-07-30 21:23:57 +02:00
Proddy
ab8e873ab4 Merge pull request #442 from MichaelDvP/v2 
Fix #441
 2020-07-30 21:20:27 +02:00
proddy
fc32f0d4b0 merge in build flags 2020-07-30 21:18:38 +02:00
proddy
d70fb41711 fix watch for CRC Rx errors 2020-07-30 21:18:28 +02:00
proddy
b20c6d4c01 only add OTA delay for ESP32 2020-07-30 21:18:09 +02:00
proddy
c48e5bd518 minor cleanup 2020-07-30 21:17:57 +02:00
proddy
2923fae1a6 clean up build settings 2020-07-30 21:17:26 +02:00
proddy
d655e50e36 turn off watch when starting new console 2020-07-30 21:17:07 +02:00
proddy
251fadc2f3 supress warnings 2020-07-30 21:16:00 +02:00
MichaelDvP
931dc6dd18 Fix #441 2020-07-30 20:43:18 +02:00
proddy
56398ccb85 fix standalone 2020-07-28 17:20:10 +02:00
proddy
4175fe56fd fix standalone (use make run) 2020-07-28 17:18:42 +02:00
proddy
9b9c7df1d8 bump to b9 2020-07-28 11:54:14 +02:00
proddy
53bfbcee06 minor cleanups 2020-07-28 11:53:48 +02:00
proddy
b1c92b6f14 send warning to console/syslog if master boiler is restarted 2020-07-28 11:53:19 +02:00
proddy
242770838d call services after settings have been persisted 2020-07-28 11:52:56 +02:00
proddy
3ab7134ca0 reset_tx() takes tx_mode from settings file 2020-07-28 11:52:23 +02:00
proddy
53aa698bbb test code only for standalone mode 2020-07-28 11:50:31 +02:00
proddy
b196fbd0fd merged from v2_uart 2020-07-27 18:57:26 +02:00
proddy
9b7d6aa6ed minor change 2020-07-27 18:57:05 +02:00
proddy
f5b214a1b2 added data to web ui 2020-07-27 18:56:52 +02:00
proddy
ced2d2df47 tx_mode optimizations 2020-07-27 18:56:37 +02:00
proddy
b062f30bdd tx_mode optimizations 2020-07-27 18:56:24 +02:00
proddy
8caa452c25 move mem calc before creating json obj 2020-07-27 18:55:30 +02:00
proddy
bb3e8b6dff added fetch command 2020-07-27 18:55:03 +02:00
proddy
63737833ae renamed command refresh to fetch 2020-07-27 18:54:53 +02:00
proddy
fe13b7559d renamed telegram MaintenanceSettings to MaintenanceData 2020-07-27 18:54:24 +02:00
proddy
b59d711ed4 merged Michael's latest UART code for ESP8266 2020-07-26 22:36:18 +02:00
proddy
2ec35d1fbc added save function to write settings to fS 2020-07-26 22:35:55 +02:00
proddy
5c354af1ba added system command wifi reconnect 2020-07-26 22:35:33 +02:00
proddy
b7e72fd18f force debug log when compiled with -DEMSESP_DEBUG 2020-07-26 21:41:45 +02:00
proddy
7109bb0d62 merge in Michael's change from v2_uart branch 2020-07-26 21:40:56 +02:00