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

6219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Proddy
0fce450418 Merge pull request #1530 from proddy/dev 
minor changes
 2023-12-28 14:21:35 +01:00
Proddy
3a92d69c77 minor changes from https branch 2023-12-28 14:20:06 +01:00
Proddy
fa1a372468 https://github.com/emsesp/EMS-ESP32/pull/1517 2023-12-28 14:19:54 +01:00
Proddy
62b341a614 Merge pull request #1517 from arturzx/dev 
fix: Fixed dev section in analog sensor HA discovery
 2023-12-28 13:56:34 +01:00
Proddy
0058632d71 Merge pull request #1523 from pswid/dev 
Polish translation update
 2023-12-28 13:53:45 +01:00
Proddy
339408e12a Merge pull request #1529 from proddy/dev 
fix HA modes from dev2 for #1525
 2023-12-28 13:41:38 +01:00
Proddy
8bffa6b304 bump version 2023-12-28 13:40:45 +01:00
Proddy
7c80364bcf package update 2023-12-28 13:39:28 +01:00
Proddy
ac950e0e92 fix from dev2 for https://github.com/emsesp/EMS-ESP32/pull/1525 2023-12-28 13:39:14 +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
Proddy
8d33a89e39 Merge pull request #1524 from MichaelDvP/dev 
add ES79 and fix german translation, fixes #1521, #1522
 2023-12-22 16:18:04 +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
pswid
d3ae73e6b2 Restored Polish characters in the font file 
Polish characters disappeared from the re.woff2 file sometime between April and August this year. I assume it was unintentional.
 2023-12-22 11:15:17 +01:00
pswid
b4b2531e33 Polish translation update 2023-12-22 10:45:37 +01:00
Proddy
225e482814 Merge pull request #1519 from MichaelDvP/dev_1 
compile with tasmota arduino 2.14 and 3.0
 2023-12-20 22:06:39 +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
Artur Zabroński
3163a142a9 fix: Fixed dev section in analog sensor HA discovery 2023-12-19 08:51:56 +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