andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,135 Commits 5 Branches 25 Tags
72f4d00cb3083f2f9ada9479ceb58b04bf2fc698
Commit Graph

6135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Proddy
c3ac215493 Merge pull request #1481 from MichaelDvP/dev 
add hpMaxPower #1475
 2023-12-04 17:38:54 +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
Proddy
f9b8ac6f30 Merge pull request #1478 from MichaelDvP/dev 
fixes for #1474 and #1477
 2023-12-03 21:28:23 +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
Proddy
7efa8ffbe0 Merge pull request #1473 from proddy/dev 
roll back dom-router changes
 2023-12-02 11:06:46 +01:00
Proddy
85016d6582 Merge branch 'emsesp:dev' into dev 2023-12-02 11:06:06 +01:00
Proddy
06bf2f3427 rollback dom router changes - https://github.com/emsesp/EMS-ESP32/pull/1465 2023-12-02 11:05:17 +01:00
Proddy
c38832ef06 fix warning 2023-12-02 11:04:45 +01:00
Proddy
c1fa5c42c4 Merge pull request #1471 from MichaelDvP/dev 
Some new/fixed entities
 2023-11-29 20:55:14 +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
Proddy
306baee94d Merge pull request #1470 from proddy/dev 
HA don't set entity_category to Diagnostic/Configuration for EMS entities
 2023-11-28 20:54:20 +01:00
Proddy
cb1989b2ea HA don't set entity_category to Diagnostic/Configuration for EMS entities 2023-11-28 20:52:59 +01:00
Proddy
7ce99cb1fb 3.6.5-dev.1 2023-11-28 20:52:44 +01:00
Proddy
3a36663d94 package update 2023-11-28 20:52:27 +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
Proddy
ba21293c42 Merge pull request #1465 from proddy/dev 
fix router loops
 2023-11-26 18:44:35 +01:00
Proddy
8574b44d4e react-router-dom 6.20.0 minimal 2023-11-26 18:44:15 +01:00
Proddy
76901d97d2 fix router 2023-11-26 15:56:46 +01:00
Proddy
1cbfc91912 remove tab from help page 2023-11-26 15:56:30 +01:00
MichaelDvP
7d6bb6b9c8 add meter heating 0x4AF, offset 24 2023-11-26 11:06:28 +01:00
Proddy
c81f579464 Merge pull request #1464 from MichaelDvP/dev 
revert to react-router-dom 6.18.0 to bring blue tab line back
 2023-11-26 09:58:35 +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
Proddy
b60127c3ba Merge pull request #1461 from MichaelDvP/dev 
revert to react-router-dom 6.19.0 to fix tab-routing-issue
 2023-11-25 10:08:17 +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