Commit Graph

527 Commits

Author SHA1 Message Date
MichaelDvP
8d3dd9d8e9 Merge branch 'dev' into dev2 2024-01-30 07:31:00 +01:00
proddy
040954bb70 tidy up commands for temperature sensor 2024-01-28 16:36:18 +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
Proddy
77607263a9 3.6.5-dev.9 2024-01-14 15:22:07 +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
ebfe487a3a add Bosch C1200 boiler id 12 2024-01-04 11:43:49 +01:00
Proddy
1316fe9509 3.6.5-dev.8 2024-01-03 22:57:13 +01:00
Proddy
8bffa6b304 bump version 2023-12-28 13:40:45 +01:00
MichaelDvP
ddd1f5de5b Merge branch 'dev' into dev2 2023-12-19 18:35:10 +01:00
MichaelDvP
9f3e2dbcd3 merge PR#1497 from pswid, add partiton, resort system status 2023-12-19 13:44:15 +01:00
proddy
8ed867314d fix SK 2023-12-17 09:46:53 +01:00
Proddy
9b1e399730 fixes #1494 2023-12-12 22:35:10 +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
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
2faa78bc32 version 3.6.5-dev.2, changelog 2023-11-29 13:12:22 +01:00
MichaelDvP
067100d375 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-29 07:12:41 +01:00
Proddy
7ce99cb1fb 3.6.5-dev.1 2023-11-28 20:52:44 +01:00
MichaelDvP
9118cd7c5b init for second exhaustTemp value (test.0c) 2023-11-28 17:54:47 +01:00
MichaelDvP
7d6bb6b9c8 add meter heating 0x4AF, offset 24 2023-11-26 11:06:28 +01:00
MichaelDvP
740f3b4ef7 Merge branch 'dev' into dev2 2023-11-24 10:28:38 +01:00
Proddy
19094d47aa 3.6.5-dev.0 2023-11-24 07:41:23 +01:00
MichaelDvP
751410ca58 fix boiler commands to ems telegrams 2023-11-23 18:27:03 +01:00
MichaelDvP
40a79c51ce add EMS_DEVICE_FLAG_BC400, sort wwmodes #1452 2023-11-22 19:45:06 +01:00
MichaelDvP
4c60545057 Merge branch 'dev' into dev2 2023-11-22 07:10:31 +01:00
MichaelDvP
64fb84dd54 Merge branch 'dev' into dev2 2023-11-21 11:24:04 +01:00
Proddy
6dba452aea patch for 3.6.3 with fixes #1440 #1442 2023-11-21 10:42:19 +01:00
MichaelDvP
a17a9b71a2 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-18 13:49:53 +01:00
Proddy
9e405c5a5a 3.6.4-dev-0 2023-11-18 13:37:55 +01:00
proddy
64471e4c0e dev.10 2023-11-16 22:07:00 +01:00
MichaelDvP
0a10e78bfd Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-16 09:14:25 +01:00
Proddy
1ada18ec9a 3.6.3-dev.9 2023-11-15 17:56:15 +01:00
MichaelDvP
72c0625823 Merge branch 'dev2x' into dev2 2023-11-14 10:57:43 +01:00
MichaelDvP
c1dabddf21 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2x 2023-11-14 10:12:02 +01:00
MichaelDvP
e30c476e5c Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-13 19:52:50 +01:00
MichaelDvP
84fab951ba fix RC300 summertemp, mode 2023-11-13 18:01:14 +01:00
Proddy
fd81299da1 3.6.3-dev.8 2023-11-12 16:00:52 +01:00
Proddy
031c97a162 3.6.3-dev.7 2023-11-11 18:01:19 +01:00
MichaelDvP
5b1f3d266e Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-11 13:52:22 +01:00
MichaelDvP
4c83f5fe60 sort water entities 2023-11-11 13:47:32 +01:00
MichaelDvP
31a5216ae8 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2x 2023-11-08 15:02:20 +01:00
Proddy
c4c9ed739f 3.6.3-dev.6 2023-11-05 17:12:35 +01:00
Proddy
cd6a0da9f0 change version to 3.6.3-test.6 so not mistaken with dev builds 2023-11-05 17:09:00 +01:00
MichaelDvP
037a9848bc version 3.6.3-dev.6c 2023-11-05 14:24:39 +01:00
MichaelDvP
d105c18bf7 fix typos, double entities, publish time water 2023-11-04 17:00:33 +01:00
MichaelDvP
3101f5e6ae move dhw entities from mixer/solar to new water device, add pool device 2023-11-04 15:24:43 +01:00
MichaelDvP
8307b0920c digital_out, settings #1375, dev.5b 2023-11-02 19:14:10 +01:00
MichaelDvP
caadb506d8 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-10-29 17:57:10 +01:00