andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,386 Commits 6 Branches 30 Tags
8d3dd9d8e9f3919fd98be96b01da191ccd2760d9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP 8d3dd9d8e9 Merge branch 'dev' into dev2 2024-01-30 07:31:00 +01:00
MichaelDvP 0f799d5922 fix broadcast sending 2024-01-30 07:15:11 +01:00
MichaelDvP 3a8bed6976 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-01-29 10:20:15 +01:00
MichaelDvP 2bd66bf4b6 reset wait_validate, typo 2024-01-28 12:16:35 +01:00
MichaelDvP ce6e89338f reset wait_validate 2024-01-28 12:15:16 +01:00
MichaelDvP 9e423d9769 Merge branch 'dev' of https://github.com/MichaelDvP/EMS-ESP32 into dev 2024-01-28 11:37:41 +01:00
MichaelDvP 52bb6b8218 Merge branch 'dev' into dev2 2024-01-28 11:35:43 +01:00
MichaelDvP 5748bd4074 Merge branch 'dev' of https://github.com/MichaelDvP/EMS-ESP32 into dev 2024-01-28 11:31:42 +01:00
MichaelDvP 6155645436 process telegram selection of device 2024-01-28 11:31:17 +01:00
MichaelDvP 0760e6e021 hpPressure telegram 2024-01-28 09:07:49 +01:00
MichaelDvP fbd3ebbd4e fetch mixer 0x2CC 2024-01-28 09:07:28 +01:00
MichaelDvP 24b8e004ec fix jsonvariant in command 2024-01-28 09:07:05 +01:00
MichaelDvP 542246c142 hpPressure telegram 2024-01-28 09:03:22 +01:00
MichaelDvP 31bea94d9c fetch mixer 0x2CC 2024-01-28 08:41:02 +01:00
MichaelDvP 5669deeb80 fix jsonvariant in command 2024-01-28 08:40:38 +01:00
MichaelDvP 1042298541 add brackets to make logic clear 2024-01-24 11:10:16 +01:00
MichaelDvP 6aca61deee typo, telegram name for pretty telegram 2024-01-24 07:44:20 +01:00
MichaelDvP 9266454f82 rework process telegram 2024-01-23 13:47:28 +01:00
MichaelDvP 21de630f8e check telegrams for dest==thermostat 2024-01-22 16:13:23 +01:00
MichaelDvP 1491f283a8 update packages 2024-01-21 09:35:26 +01:00
MichaelDvP a8c3b21ee6 Merge branch 'dev' into dev2 2024-01-21 09:35:16 +01:00
MichaelDvP c0e77698aa Add custom variables #1423 2024-01-20 17:57:01 +01:00
MichaelDvP 9fd7b2553c set min/max for hpDiffPress 2024-01-20 17:24:47 +01:00
MichaelDvP cd8921e78e add hpSetDiffPressure #1563 2024-01-20 15:01:41 +01:00
MichaelDvP 9260db330e add mixer values #1554 2024-01-20 15:01:11 +01:00
MichaelDvP 3b32dcb407 Map telegrams as mentioned in #1563 2024-01-20 14:59:59 +01:00
MichaelDvP 4d1a428acf fix #1565, use String for output a single api_data 2024-01-20 10:48:16 +01:00
MichaelDvP cc83dab97b remove unused type 2024-01-20 10:46:10 +01:00
MichaelDvP 65ff765219 workaround for #1564 2024-01-20 10:45:52 +01:00
MichaelDvP d5cb5c1c51 update packages 2024-01-20 10:45:01 +01:00
MichaelDvP 4974208a65 update arduinoJson 7.02 2024-01-20 08:36:06 +01:00
MichaelDvP e88ede2d8b typo 2024-01-20 08:29:17 +01:00
MichaelDvP 6c398109f4 Mixer set message to 0x2CD, .. 2024-01-14 10:20:54 +01:00
MichaelDvP 74691ce34a roomctrl RC200 version with 2.id 2024-01-13 15:43:31 +01:00
MichaelDvP ef6ac3848f mixer telegram 0x2CC, #1554 2024-01-13 15:36:01 +01:00
MichaelDvP 5c490834cf fix telegram length check of remote 2024-01-13 13:25:25 +01:00
MichaelDvP 7b4f76d51d remote type depends on control setting 2024-01-12 10:42:16 +01:00
MichaelDvP 16010b2223 remote use RC200 for hc3/4 2024-01-12 09:50:21 +01:00
MichaelDvP ea2d5b77c0 use RC100H again for remote 2024-01-11 18:24:46 +01:00
MichaelDvP 81b0b77e2b type-ids RemoteCorrection/Batterie device dependend 2024-01-11 17:34:24 +01:00
MichaelDvP af1209cb04 fix roomctrl for hc>1 2024-01-11 07:55:07 +01:00
MichaelDvP b6ec8e14ec remote emulation RC200 for hc3/4 instead of RC100H 2024-01-10 18:32:23 +01:00
MichaelDvP 63cf4bdc21 remote thermostat for hc3 at 0x1A 2024-01-09 10:51:59 +01:00
MichaelDvP 8ddc167f93 Merge branch 'dev' into dev2 2024-01-08 11:26:17 +01:00
MichaelDvP 54d2f38841 Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2 2024-01-08 11:26:07 +01:00
MichaelDvP 5f2859fae2 fix typo #1521 2024-01-08 11:23:17 +01:00
MichaelDvP ae15c7ccd0 add boiler C1200W, #1536 2024-01-06 16:50:37 +01:00
MichaelDvP 025f43953a Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2024-01-06 16:36:01 +01:00
MichaelDvP bf95205af6 fix #1495 wwComfort mode 2024-01-06 16:10:12 +01:00
MichaelDvP e8217b68a5 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2024-01-04 11:53:38 +01:00
MichaelDvP ebfe487a3a add Bosch C1200 boiler id 12 2024-01-04 11:43:49 +01:00
MichaelDvP ce34567939 another test wwComfort 2024-01-04 11:43:29 +01:00
MichaelDvP a81695e973 Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2 2024-01-03 08:04:42 +01:00
MichaelDvP 8d1a36c669 wwcomfort on ems+ 2024-01-03 08:04:20 +01:00
MichaelDvP 41260a4370 fix nompower warning 2023-12-22 14:46:23 +01:00
MichaelDvP 7d15a8010d update pkg 2023-12-22 12:32:10 +01:00
MichaelDvP 606a7e6eec add Sieger ES79, #1521 2023-12-22 12:27:39 +01:00
MichaelDvP 83e400fbe9 fix german translation from #1522 2023-12-22 12:25:07 +01:00
MichaelDvP ddd1f5de5b Merge branch 'dev' into dev2 2023-12-19 18:35:10 +01:00
MichaelDvP 446601c6e0 update mqttClient, works with tasmota-arduino 2.14 / 3.0 without WiFiSecure 2023-12-19 13:47:10 +01:00
MichaelDvP 9f3e2dbcd3 merge PR#1497 from pswid, add partiton, resort system status 2023-12-19 13:44:15 +01:00
MichaelDvP dcb0d5087f Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2023-12-18 18:18:10 +01:00
MichaelDvP e2544947f7 sk-translation 2023-12-18 10:47:58 +01:00
MichaelDvP 19743da558 translation cold water 2023-12-18 09:48:25 +01:00
MichaelDvP ca2ca972b9 add sk entity translations 2023-12-17 13:58:04 +01:00
MichaelDvP 215c4e49ca sort translation alphabetical 2023-12-17 12:48:36 +01:00
MichaelDvP d1dbce84c7 ethernet working with arduino_3.0 2023-12-17 12:39:36 +01:00
MichaelDvP fb4a0b0ae8 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2023-12-17 12:35:46 +01:00
MichaelDvP 854a39fe6b ethernet working with arduino_3.0 2023-12-17 12:35:07 +01:00
MichaelDvP a684a46404 Merge branch 'dev' into dev2 2023-12-14 07:59:01 +01:00
MichaelDvP 1556bf02ba fix setting dhw comfort #1495 2023-12-14 07:57:48 +01:00
MichaelDvP a0e1894262 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-12-13 07:24:06 +01:00
MichaelDvP ee584375c5 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2023-12-13 07:15:52 +01:00
MichaelDvP 29a3e79804 Merge branch 'dev' into dev2 2023-12-12 14:41:31 +01:00
MichaelDvP d78d4aed9d Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2023-12-12 14:40:38 +01:00
MichaelDvP 9f34531956 fix dhw comfort mode, #1495 2023-12-12 10:11:52 +01:00
MichaelDvP d1f3ead8b9 fix mqtt::on_message, #1494 2023-12-12 10:09:02 +01:00
MichaelDvP b9af4325c9 set curBurnPower for 3.party burners, #1483 2023-12-11 10:57:17 +01:00
MichaelDvP 1ae2a624f7 add back lowres dewtemp, #1491 2023-12-11 09:12:23 +01:00
MichaelDvP d4c9a3c846 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2023-12-11 09:05:58 +01:00
MichaelDvP 72f4d00cb3 Merge branch 'dev' into dev2 2023-12-09 15:41:03 +01:00
MichaelDvP c9f5b0a2c1 fix wwCurFlow #1334, fix active state #1483, dev.4 2023-12-09 15:39:10 +01:00
MichaelDvP 8453422c9c Merge branch 'dev' into dev2 2023-12-08 19:15:41 +01:00
MichaelDvP ed060a400d update packages 2023-12-08 19:15:15 +01:00
MichaelDvP 6c3e5d976c console tx_mode without reboot 2023-12-08 19:15:05 +01:00
MichaelDvP 443050ae28 fix syspress for ems+ 2023-12-08 19:14:29 +01:00
MichaelDvP 510602e117 fix RC300 mode, #1488 2023-12-08 11:34:20 +01:00
MichaelDvP 4081a55207 Merge branch 'dev' into dev2 2023-12-04 17:39:29 +01:00
MichaelDvP 10cabd032b update packages, formatting, changelog 2023-12-04 17:27:07 +01:00
MichaelDvP 7b9a04ede1 add hpMaxPower fix #1475 2023-12-04 17:17:23 +01:00
MichaelDvP 1845d5060a add hpMaxPower 2023-12-04 17:11:40 +01:00
MichaelDvP ad577eaa2a Merge branch 'dev' into dev2 2023-12-03 18:24:06 +01:00
MichaelDvP 42ba93bdc1 add checkbox for MQTT-TLS, fix #1474 2023-12-03 18:07:30 +01:00
MichaelDvP fd5f5d49b7 add back boil2hyst, fix #1477 2023-12-03 17:23:02 +01:00
MichaelDvP 2faa78bc32 version 3.6.5-dev.2, changelog 2023-11-29 13:12:22 +01:00
MichaelDvP b5633cd579 add texts 2023-11-29 13:02:43 +01:00
MichaelDvP 4275d144ca add boiler pumpmode and HP heat meter 2023-11-29 12:32:42 +01:00
MichaelDvP 7f794f35a6 add thermostat heatdelays, instantstart and boost 2023-11-29 12:32:04 +01:00
MichaelDvP 8d778f902f add heatpump energy meters 2023-11-29 12:31:05 +01:00
MichaelDvP f83f22a6fb send step as string to avoid js-rounding issue for 0.1 2023-11-29 12:06:56 +01:00