Commit Graph

6093 Commits

Author SHA1 Message Date
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
Proddy
d36246d4d1 Merge pull request #1458 from proddy/dev
3.6.5-dev.0
2023-11-24 07:41:46 +01:00
Proddy
19094d47aa 3.6.5-dev.0 2023-11-24 07:41:23 +01:00
Proddy
24cca67625 Merge pull request #1457 from proddy/dev
update packages
2023-11-24 07:28:52 +01:00
Proddy
41443d4efe update packages 2023-11-24 07:28:29 +01:00
Proddy
6e08356ff7 Merge pull request #1455 from MichaelDvP/dev
fix boiler commands to ems telegrams
2023-11-23 19:07:13 +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
Proddy
01a15a5c85 Merge pull request #1451 from MichaelDvP/dev
next fix RC300 mode
2023-11-22 08:24:25 +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
Proddy
5ad03facce Merge pull request #1445 from proddy/dev
patch for 3.6.3 with fixes #1440 #1442
2023-11-21 10:43:08 +01:00
Proddy
ad3bf294d8 Merge branch 'emsesp:dev' into dev 2023-11-21 10:42:39 +01:00
Proddy
6dba452aea patch for 3.6.3 with fixes #1440 #1442 2023-11-21 10:42:19 +01:00
Proddy
cff5b8c949 Merge pull request #1444 from MichaelDvP/dev
set/read thermostat mode for RC100-RC300, fix #1440 and fix #1442
2023-11-21 10:33:46 +01:00
MichaelDvP
aed45968db set/read thermostat mode for RC100-RC300, fix #1440 2023-11-20 07:47:01 +01:00
Proddy
2de855e044 Merge pull request #1439 from proddy/dev
prepare another 3.6.3 build with board profile fixed
2023-11-19 21:19:10 +01:00
Proddy
dfd9fe4d01 add EMSESP_DEFAULT_BOARD_PROFILE to CI builds 2023-11-19 21:18:15 +01:00
Proddy
049f956131 minor cleanup 2023-11-19 21:17:54 +01:00
Proddy
b503e2bb90 package update 2023-11-19 21:17:43 +01:00
Proddy
b300181d33 add hosted target 2023-11-19 21:17:36 +01:00
Proddy
905b52e39d Merge pull request #1438 from MichaelDvP/dev
fix crash on wrong thermostat mode command (if not using HA)
2023-11-18 14:05:54 +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
Proddy
64d46fe8f7 Merge pull request #1437 from proddy/dev
update changelog
2023-11-18 13:43:27 +01:00
Proddy
7962af0872 update changelog 2023-11-18 13:42:50 +01:00
Proddy
873b75240c Merge pull request #1436 from proddy/dev
3.6.4-dev-0
2023-11-18 13:38:20 +01:00
Proddy
9e405c5a5a 3.6.4-dev-0 2023-11-18 13:37:55 +01:00