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,431 Commits 5 Branches 25 Tags
e2eb5a61d4f81a9c09e5a08b409253f71c9cd635
Commit Graph

954 Commits

Author SHA1 Message Date
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
proddy
b012c8a695 don't show summer/holiday modes if not supported 2020-06-25 17:05:57 +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
c644990c14 set first active hc for mqtt and terminal commands, some fixes for #410 2020-06-25 10:28:58 +02:00
MichaelDvP
1c73af88d2 fix fluctuating bitvalues, fix "send telegram", add solarpump softstart, add DHW temp for 9000i 2020-06-23 13:15:56 +02:00
proddy
1e97ced1a7 bump to a27 2020-06-22 21:11:47 +02:00
proddy
9cbeddcd4c add test for solar modulation % 2020-06-22 21:11:05 +02:00
proddy
b5f13a040e removed comment 2020-06-22 21:02:35 +02:00
proddy
bc0f59effd rename calculated circuit flow to targetflowtemp 2020-06-22 21:02:17 +02:00
proddy
03500ceb3b fix read_bitvalue() - for solar pump on/off in #397 2020-06-22 20:51:08 +02:00
proddy
b643a7d8a7 more tests for km200 2020-06-22 16:32:38 +02:00
proddy
2fcf8d169f tx_mode resets counts 2020-06-22 16:32:19 +02:00
MichaelDvP
28b2f6116e RC300 show only active hc, summermode and setpoint 2020-06-22 14:22:04 +02:00
Proddy
9566f86ac9 Merge pull request #405 from MichaelDvP/v2 
do not call shell while sending
 2020-06-21 18:00:43 +02:00
proddy
abd9a26f05 fix to testing int16_t 2020-06-21 17:00:56 +02:00
proddy
2ac923a25a minor text change 2020-06-21 16:03:01 +02:00
proddy
e1269bcb31 refactor read_value. added read_bitvalue 2020-06-21 16:02:37 +02:00
proddy
99ed9032b0 added tests for render and read_value 2020-06-21 15:49:09 +02:00
MichaelDvP
5d6e9dd704 do not call shell while sending 2020-06-21 14:18:28 +02:00
proddy
04503298ab fix retry bug 2020-06-20 11:27:31 +02:00
proddy
ea9b913285 added more tests for km200 - #390 2020-06-20 11:26:23 +02:00
proddy
5856a6cb2a bump to version a24 2020-06-19 20:40:37 +02:00
proddy
d42ba886a2 undo change I made 2020-06-19 20:40:13 +02:00
Proddy
05161e7a39 Merge pull request #402 from MichaelDvP/v2 
Uart mode 5
 2020-06-19 20:29:38 +02:00
proddy
e0a35066fc refactor tx retry 2020-06-19 20:27:21 +02:00
proddy
cf8404be86 refactor tx retry 2020-06-19 20:26:58 +02:00
proddy
020f7d205c update test for km200 2020-06-19 20:25:55 +02:00
MichaelDvP
76a5de4bf9 Merge branch 'v2' of https://github.com/proddy/EMS-ESP into v2 2020-06-19 16:22:06 +02:00
MichaelDvP
5a189813ee new uartmode 5 to test 2020-06-19 08:36:29 +02:00
proddy
4d40a53bd8 EMSUART_TX_TIMEOUT is 32*8 2020-06-18 12:28:11 +02:00
proddy
2cde691f08 typo, EMSUART_TX_TIMEOUT should be 32*8 2020-06-18 12:27:56 +02:00
proddy
ee13a02409 cleaner handling of Tx retries for both READ and WRITE operations 2020-06-18 12:19:21 +02:00
proddy
eae1137670 set EMSUART_TX_TIMEOUT to 256 so tx_mode 1 works again - #398 2020-06-18 12:18:21 +02:00
Proddy
3c8f2aff8a Merge branch 'v2' into v2 2020-06-17 17:28:09 +02:00
proddy
ccd999bd6a also parse any messages going to a gateway/modem 2020-06-17 16:29:20 +02:00
proddy
e1e0a2ce2b added EMS_DEVICE_ID_MODEM 0x48 2020-06-17 16:28:49 +02:00