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,199 Commits 5 Branches 25 Tags
ce3456793944ffcc677e007c4aeb6c3127855f28
Commit Graph

6199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Proddy
77700c4873 Merge pull request #1525 from Bingo2023/dev2 
Dev2 - corrected mode control for HA (including translations).
 2023-12-28 07:48:01 +01:00
Bingo2023
d035a29f24 // corrected mode control for HA (including translations). 
modified:   src/mqtt.cpp
 2023-12-23 14:14:20 +01:00
Bingo2023
4c51b90663 modified: src/mqtt.cpp 2023-12-22 20:02:12 +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
Proddy
08c5fd8f64 Merge pull request #1514 from MichaelDvP/dev 
ethernet with arduino_3.0, sort translations alphabetical
 2023-12-18 09:45:38 +01:00
Proddy
a28cdaa930 Merge pull request #1515 from proddy/dev 
add SK entity translations (from Michael)
 2023-12-18 09:44:25 +01:00
proddy
3f31962a9a add SK translations (from Michael) 2023-12-18 09:43:38 +01:00
proddy
651b1b1c50 package update 2023-12-18 09:43:21 +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
Proddy
a01ee4a48d Merge pull request #1513 from proddy/dev 
fix SK
 2023-12-17 09:47:19 +01:00
proddy
8ed867314d fix SK 2023-12-17 09:46:53 +01:00
Proddy
abf4eeb39a Merge pull request #1508 from misa1515/patch-8 
Update index.ts
 2023-12-17 09:33:00 +01:00
Proddy
40a85634ef Merge pull request #1509 from misa1515/patch-9 
Update LayoutAuthMenu.tsx
 2023-12-17 09:32:31 +01:00
Proddy
a5c41a1cd8 Merge pull request #1510 from misa1515/patch-10 
Update SignIn.tsx
 2023-12-17 09:32:07 +01:00
Proddy
c6668e1d6a Merge pull request #1511 from misa1515/patch-11 
Update system.cpp
 2023-12-17 09:31:38 +01:00
misa1515
5384abc780 Update system.cpp 2023-12-16 22:54:14 +01:00
misa1515
444d5fb7c3 Update SignIn.tsx 2023-12-16 22:50:51 +01:00
misa1515
3b76a020c7 Update LayoutAuthMenu.tsx 2023-12-16 22:49:23 +01:00
misa1515
804187afb9 Update index.ts 2023-12-16 22:44:54 +01:00
Proddy
ef2ed0f4d1 Merge pull request #1507 from proddy/dev 
add SK
 2023-12-16 22:40:08 +01:00
proddy
68084fc9b5 add SK 2023-12-16 22:36:25 +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
Proddy
b29c36d01d Merge pull request #1500 from MichaelDvP/dev2 
Testbild keep up to date with dev
 2023-12-13 11:52:18 +01:00
Proddy
68cb94547e Merge pull request #1499 from MichaelDvP/dev 
latest entities
 2023-12-13 11:51:58 +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
Proddy
ac288b794f Merge pull request #1493 from proddy/dev 
update standalone server to bun and itty-router, add back router paths, add support download button
 2023-12-12 22:37:56 +01:00
Proddy
a1f296b2ae upercase Remember 2023-12-12 22:37:48 +01:00
Proddy
9b1e399730 fixes #1494 2023-12-12 22:35:10 +01:00
Proddy
dd6b435417 merge latest change from official repo 2023-12-12 22:34:34 +01:00
Proddy
3d5c08118c package update 2023-12-12 22:34:18 +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
Proddy
a33f17932f support info downloaded as txt 2023-12-11 16:18:11 +01:00
Proddy
eb05b83009 package update 2023-12-11 16:17:57 +01:00