 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 |
|
|
MichaelDvP
|
03b6ebd861
|
fix exhaust temperature #1467
|
2023-11-29 12:05:46 +01:00 |
|
|
MichaelDvP
|
0d4607a922
|
send "step" as string
|
2023-11-29 11:55:27 +01:00 |
|
|
MichaelDvP
|
067100d375
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
|
2023-11-29 07:12:41 +01:00 |
|
|
MichaelDvP
|
9118cd7c5b
|
init for second exhaustTemp value (test.0c)
|
2023-11-28 17:54:47 +01:00 |
|
|
MichaelDvP
|
8b0cf599f4
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
|
2023-11-27 07:34:24 +01:00 |
|
|
MichaelDvP
|
7d6bb6b9c8
|
add meter heating 0x4AF, offset 24
|
2023-11-26 11:06:28 +01:00 |
|
|
MichaelDvP
|
2a6fedc6b3
|
hetpump energy meters, sync with HP id 0x08
|
2023-11-26 09:11:46 +01:00 |
|
|
MichaelDvP
|
e3a7e9fe33
|
Merge branch 'dev' into dev2
|
2023-11-26 09:03:58 +01:00 |
|
|
MichaelDvP
|
8898ec9419
|
revert to react-router-dom 6.18.0 to bring blue tab line back
|
2023-11-26 08:59:32 +01:00 |
|
|
MichaelDvP
|
548fdd823b
|
version
|
2023-11-25 15:50:42 +01:00 |
|
|
MichaelDvP
|
095255b9b7
|
revert to react-router-dom 6.19.0 to fix tab-routing-issue
|
2023-11-24 13:36:55 +01:00 |
|
|
MichaelDvP
|
2b486ffa36
|
revert package update
|
2023-11-24 13:23:33 +01:00 |
|
|
MichaelDvP
|
c3f9d9ddd6
|
Merge branch 'dev2' of https://github.com/MichaelDvP/EMS-ESP32 into dev2
|
2023-11-24 10:44:44 +01:00 |
|
|
MichaelDvP
|
740f3b4ef7
|
Merge branch 'dev' into dev2
|
2023-11-24 10:28:38 +01:00 |
|
|
MichaelDvP
|
932a496f47
|
revert to react-router-dom 6.19.0 to fix tab-routing-issue
|
2023-11-24 10:15:34 +01:00 |
|
|
MichaelDvP
|
751410ca58
|
fix boiler commands to ems telegrams
|
2023-11-23 18:27:03 +01:00 |
|
|
MichaelDvP
|
60beeddb66
|
HIU heating/tapwater-active, always use EMSdevice:: for flags
|
2023-11-23 17:30:38 +01:00 |
|
|
MichaelDvP
|
c61c34f10e
|
HIU heating/tapwater-active, always use EMSdevice:: for flags
|
2023-11-23 17:24:40 +01:00 |
|
|
MichaelDvP
|
96a04da1ff
|
add settings for #1389
|
2023-11-23 15:27:38 +01:00 |
|
|
MichaelDvP
|
bd8472b34e
|
fix settings for EMS boilers
|
2023-11-23 15:26:00 +01:00 |
|
|
MichaelDvP
|
09228e4637
|
update MqttClient
|
2023-11-23 09:23:04 +01:00 |
|
|
MichaelDvP
|
40a79c51ce
|
add EMS_DEVICE_FLAG_BC400, sort wwmodes #1452
|
2023-11-22 19:45:06 +01:00 |
|
|
MichaelDvP
|
1e15f65b0d
|
get mode for seltemp, fix #1450
|
2023-11-22 07:50:50 +01:00 |
|
|
MichaelDvP
|
0818728c25
|
update packages
|
2023-11-22 07:50:21 +01:00 |
|
|
MichaelDvP
|
2edfe0f42c
|
add hpPumpMode #1449
|
2023-11-22 07:37:40 +01:00 |
|
|
MichaelDvP
|
a2eb8dfe83
|
update packages
|
2023-11-22 07:37:32 +01:00 |
|
|
MichaelDvP
|
4c60545057
|
Merge branch 'dev' into dev2
|
2023-11-22 07:10:31 +01:00 |
|
|
MichaelDvP
|
d06b3285bd
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev
|
2023-11-21 21:58:59 +01:00 |
|
|
MichaelDvP
|
4dcfe8e0f6
|
get mode for seltemp, fix #1450
|
2023-11-21 21:58:10 +01:00 |
|
|
MichaelDvP
|
42e679d5ba
|
Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev
|
2023-11-21 11:32:31 +01:00 |
|
|
MichaelDvP
|
4db1c7dfca
|
add boostmode/time #1446
|
2023-11-21 11:25:25 +01:00 |
|
|
MichaelDvP
|
64fb84dd54
|
Merge branch 'dev' into dev2
|
2023-11-21 11:24:04 +01:00 |
|
|
MichaelDvP
|
aed45968db
|
set/read thermostat mode for RC100-RC300, fix #1440
|
2023-11-20 07:47:01 +01:00 |
|
|
MichaelDvP
|
8fcfb3d8f7
|
fix crash on wrong thermostat mode command (if not using HA)
|
2023-11-18 13:55:28 +01:00 |
|
|
MichaelDvP
|
a17a9b71a2
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
|
2023-11-18 13:49:53 +01:00 |
|
|
MichaelDvP
|
0a10e78bfd
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
|
2023-11-16 09:14:25 +01:00 |
|
|
MichaelDvP
|
50777bd681
|
temporary fix for values/info command
|
2023-11-15 19:11:59 +01:00 |
|
|
MichaelDvP
|
acb453bd4b
|
fix water: retValve and circ time control
|
2023-11-15 18:13:43 +01:00 |
|
|
MichaelDvP
|
cf89a06437
|
do not remove fetches
|
2023-11-15 11:48:18 +01:00 |
|
|
MichaelDvP
|
4a1ea99ee7
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2x
|
2023-11-15 11:31:58 +01:00 |
|
|
MichaelDvP
|
3dbf8a0fd1
|
fix crash on wrong input for switchtime
|
2023-11-15 11:31:51 +01:00 |
|
|
MichaelDvP
|
9c6b9a5359
|
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2
|
2023-11-15 11:27:19 +01:00 |
|
|
MichaelDvP
|
0d07a9e50c
|
add some water entities
|
2023-11-15 11:26:45 +01:00 |
|