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
4,023 Commits 5 Branches 25 Tags
fc057d18c99e9ded6fe34f0bd3aa46480d9d0879
Commit Graph

4023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP
c81e3e832a handle EM10 as switch 2022-07-21 17:48:28 +02:00
MichaelDvP
a018432b81 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-07-21 17:48:04 +02:00
MichaelDvP
6bc8a4b6c5 EM10 as switch 2022-07-21 08:57:48 +02:00
Proddy
32dcd7313b Merge pull request #579 from proddy/dev 2022-07-21 08:16:48 +02:00
Proddy
387c9c63f1 typo 2022-07-20 20:34:55 +02:00
Proddy
ca30b8233b fixes 2022-07-20 20:33:43 +02:00
Proddy
c3757f95e5 only send MQTT after shower finished 2022-07-20 12:04:01 +02:00
Proddy
66fbd2b359 show MQTT disconnects as warnings #543 2022-07-20 12:03:47 +02:00
Proddy
4420ae33b8 merge upload and download in webUI #577 2022-07-20 12:03:21 +02:00
Proddy
d707e92d59 formatting 2022-07-20 12:02:32 +02:00
MichaelDvP
273526dc16 check tags 2022-07-19 12:59:54 +02:00
MichaelDvP
ebc5cfa2d8 add tag "ahs" for alternative heating source 2022-07-19 07:50:37 +02:00
MichaelDvP
13430de3ba detect boiler with id 0x60 2022-07-18 21:04:53 +02:00
MichaelDvP
78dee6c7fe AM200 temperatures 2022-07-18 20:04:56 +02:00
MichaelDvP
43db536878 add EM10 error detection module 2022-07-18 19:43:59 +02:00
MichaelDvP
c765a274b2 AM200, first test 2022-07-18 17:20:05 +02:00
MichaelDvP
8101fcf95d button for help->info, file: .json.txt 2022-07-18 13:48:49 +02:00
Proddy
69568abb8a Merge pull request #572 from MichaelDvP/dev 
fix automatic build
 2022-07-13 00:26:22 +05:30
MichaelDvP
a14b43dbe2 update packages 2022-07-12 13:51:46 +02:00
Proddy
2fedd6da15 Merge pull request #571 from MichaelDvP/dev 
FS_Buffer to 8k for customizations, fix#570
 2022-07-12 14:36:20 +05:30
MichaelDvP
fc3224c9ea FS_Buffer to 8k for customizations 2022-07-12 10:27:35 +02:00
Proddy
39feb25600 Merge pull request #568 from proddy/dev 
fix column size for temperature
 2022-07-05 13:12:01 +02:00
proddy
eddbacf5a7 fix column size for temperature 2022-07-05 13:00:58 +02:00
Proddy
4e5b460447 Merge pull request #567 from proddy/dev 
update table packages
 2022-07-04 21:43:03 +02:00
Proddy
0e172ff06d update table packages 2022-07-04 21:42:35 +02:00
Proddy
40fa1d47bc Merge pull request #566 from MichaelDvP/dev 2022-06-30 11:56:58 +02:00
MichaelDvP
70fe08a3c8 fix #550 set_summermode 2022-06-27 16:45:32 +02:00
MichaelDvP
b840e2a6b5 Merge branch 'emsesp:dev' into dev 2022-06-27 14:38:58 +02:00
MichaelDvP
422657fbf7 fix #550 
typo summersetmode/summermode
 2022-06-27 14:26:56 +02:00
Proddy
da596a01b9 Merge pull request #563 from proddy/dev 
optimize for mobile phone layout
 2022-06-26 21:13:16 +02:00
Proddy
96d2fd2393 optimize for mobile phone layout 2022-06-26 21:12:21 +02:00
Proddy
42c9aeeed6 Merge pull request #562 from proddy/dev 
fix multiline
 2022-06-25 16:35:05 +02:00
Proddy
a9b32d8ba7 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2022-06-25 16:34:19 +02:00
Proddy
30da267db0 fix #547 2022-06-25 16:34:18 +02:00
Proddy
84f643e461 Merge pull request #561 from proddy/dev 
table resizing fix
 2022-06-25 14:28:07 +02:00
Proddy
6298fab94f Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2022-06-25 14:25:53 +02:00
Proddy
9639f9cee6 fix table column resizing #519 2022-06-25 14:25:51 +02:00
Proddy
4af1de4093 auto-formatting 2022-06-25 14:25:31 +02:00
Proddy
2c90a2c3aa 3.4.2b3 2022-06-25 14:25:11 +02:00
Proddy
254d4dd02d updated packages 2022-06-25 14:25:05 +02:00
Proddy
4eceeea4d1 3.4.2b3 2022-06-25 14:24:52 +02:00
MichaelDvP
efa5eb273c show summermode or operatingmode, fix #550 2022-06-25 09:51:15 +02:00
Proddy
8a05e11297 Merge pull request #560 from pswid/dev 
Shorten "friendly names" in Home Assistant
 2022-06-24 13:59:58 +02:00
pswid
1238e89084 add unit of measurement in HA for analog sensors 2022-06-21 20:39:52 +02:00
pswid
1c48d12167 Shorten "friendly names" in Home Assistant 
see #555
 2022-06-21 20:28:22 +02:00
Proddy
1fab47acd5 Merge pull request #558 from MichaelDvP/dev 
burner max power to 254%, fix #553
 2022-06-21 10:06:17 +02:00
MichaelDvP
0e563e91b1 burner max power to 254%, fix #553 2022-06-21 06:37:47 +02:00
Proddy
43b1a4572a Merge pull request #557 from MichaelDvP/dev 2022-06-20 22:21:54 +02:00
MichaelDvP
bf18718b9a shortname to wwVacations/wwHoliday to avoid conflict 2022-06-20 21:38:12 +02:00
Proddy
8790d81e03 Merge pull request #556 from MichaelDvP/dev 
fix #554, add dhw vacation/holiday
 2022-06-20 20:16:56 +02:00