andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,859 Commits 5 Branches 25 Tags
a8bf42bbf520288869ff4b51f1a3c97d3e3e9dc7
Commit Graph

1859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
proddy
598a4fd036 b2 2020-07-06 20:44:07 +02:00
proddy
5d3ad7d369 ip address dev change 2020-07-06 20:43:55 +02:00
MichaelDvP
43b519f5ba Merge branch 'v2_web' of https://github.com/proddy/EMS-ESP into web 2020-07-06 14:46:45 +02:00
proddy
2621a51dd2 updates to things that I need to fix 2020-07-06 13:35:04 +02:00
proddy
85debcbebe improvements to EMS-ESP web status page 2020-07-06 13:31:07 +02:00
proddy
4fb88fbcac fix color of info icons 2020-07-06 13:30:39 +02:00
proddy
686c51d0c4 disabled uart if tx_mode is 0 2020-07-06 13:30:00 +02:00
proddy
cfce4964bf fixes to checking bus status 2020-07-06 13:29:41 +02:00
proddy
58b93fb62d added tank heated and collector on/off - #422 2020-07-06 13:27:47 +02:00
MichaelDvP
5261a42c30 no prompt in logging 2020-07-06 08:40:36 +02:00
MichaelDvP
909f292c75 uart fixed delay 2020-07-05 21:47:30 +02:00
proddy
c5933e8c14 initial commit 2020-07-05 18:29:08 +02:00
proddy
b457ad8367 bumped to 2.0.0.a32 with Michael's PR 2020-07-05 17:49:18 +02:00
Proddy
991c0f2601 Merge pull request #419 from MichaelDvP/v2 
V2
 2020-07-05 17:46:15 +02:00
MichaelDvP
be0951b2c3 thermostat: add times for pause/party/holiday, validate typeids changed 2020-07-05 13:45:36 +02:00
MichaelDvP
eb5ce5fb33 validate read to queue front 2020-07-05 13:40:15 +02:00
MichaelDvP
627807d57f sensor conversion time set to min 1 sec. 2020-07-05 13:37:34 +02:00
MichaelDvP
d9fd27c22b esp32 uart tx-modes working 2020-07-03 10:32:10 +02:00
MichaelDvP
7d4d69ae62 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-07-03 09:54:00 +02:00
MichaelDvP
51e52846f0 mode settings, RC35 temperature factor, UART modes 2020-07-02 16:56:37 +02:00
proddy
782cde1b76 2.0.0.a31 with Michael's last PR 2020-07-01 20:02:24 +02:00
Proddy
d95da39d5e Merge pull request #417 from MichaelDvP:v2 
V2
 2020-07-01 19:59:42 +02:00
MichaelDvP
1b00a4405b Junkers modes sorted. 2020-06-30 16:53:32 +02:00
MichaelDvP
876489494f Merge a30, fix summer/holidaymode, ww_mode in thermostat 2020-06-29 15:19:07 +02:00
proddy
b06f3eb41f ww comfort setting back to 0, D8, EC - #413 2020-06-27 22:51:19 +02:00
proddy
c5e7806fb1 a30 2020-06-27 22:50:36 +02:00
proddy
591a81b22a text change 2020-06-27 22:50:30 +02:00
MichaelDvP
b45dc92159 publish thermostat wwMode 2020-06-27 14:57:01 +02:00
MichaelDvP
e2eb5a61d4 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-27 14:42:43 +02:00
MichaelDvP
55da8a77d2 add wWSetTemp to boiller mqtt, add wwmode to thermostat 2020-06-27 14:42:30 +02:00
proddy
a3644d08dd always capture current room temp, even if its not valid 2020-06-26 15:23:57 +02:00
proddy
f57f6b1095 minor text changes 2020-06-26 13:04:22 +02:00
proddy
fdd3184590 tidied up print_value so its consistent across all types 2020-06-26 13:04:08 +02:00
proddy
8bfa71fb0f turn off watch when starting new shell session 2020-06-26 13:03:06 +02:00
proddy
4bea741958 add uptime in seconds to heartbeat MQTT payload 2020-06-26 13:02:20 +02:00
proddy
f9233076bf a29 2020-06-26 13:01:49 +02:00
MichaelDvP
4b06a6dd13 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-26 05:59:46 +02:00
proddy
b012c8a695 don't show summer/holiday modes if not supported 2020-06-25 17:05:57 +02:00
MichaelDvP
c5ce22eb6e Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-25 16:32:06 +02:00
proddy
aa29992a2e rename brand to brand_to_string() 2020-06-25 16:12:29 +02:00
proddy
ab295f06b6 fix for boilers/controllers clashing with same product_id. Don't overwrite brand if we already have one. 2020-06-25 16:12:04 +02:00
proddy
466c1ddb15 added more consts, merged Michael's fix for sending EMS+ Tx 2020-06-25 16:11:08 +02:00
proddy
ed0e75cb77 supress printing some values if unset 2020-06-25 16:10:23 +02:00
proddy
ffc5d15734 version a28 2020-06-25 16:10:00 +02:00
proddy
ca8ad8e999 text formatting 2020-06-25 16:09:30 +02:00
proddy
60757354e3 text formatting 2020-06-25 16:08:44 +02:00
proddy
755789fd33 added 'unknown' test for boiler/controller conflicts 2020-06-25 16:08:30 +02:00
MichaelDvP
ad7de09a62 fix send_telegram TX_READ for EMS+ 2020-06-25 13:17:07 +02:00
Proddy
4227ebe78e Merge pull request #411 from MichaelDvP/v2 
set first active hc for mqtt and terminal commands, some fixes for #410
 2020-06-25 11:55:38 +02:00
MichaelDvP
f32f4ad469 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-25 10:30:17 +02:00