Commit Graph

3908 Commits

Author SHA1 Message Date
Proddy
30da267db0 fix #547 2022-06-25 16:34:18 +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
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
MichaelDvP
0e5cb2df8e fix #554, add dhw vacation/holiday 2022-06-20 17:42:38 +02:00
Proddy
46c5913000 Merge pull request #552 from proddy/dev
update packages
2022-06-17 11:29:50 +02:00
Proddy
c35433856f update packages 2022-06-17 11:28:55 +02:00
Proddy
67f898bbec force removal of directories 2022-06-17 11:28:50 +02:00
Proddy
449c01d345 Merge pull request #551 from MichaelDvP/dev
fix #549, set minimum emergencyTemp to 15°C
2022-06-17 10:59:38 +02:00
MichaelDvP
cec1fce745 fix #549, set minimum emergencyTemp to 15°C 2022-06-15 09:56:25 +02:00
Proddy
a02d4ab259 Merge pull request #545 from MichaelDvP/dev
update OneWire lib #542
2022-06-07 21:19:25 +02:00
MichaelDvP
a22783a3e4 update OneWire lib 2022-06-07 08:18:56 +02:00
Proddy
9524ec1317 Merge pull request #544 from proddy/dev
minor fixes
2022-06-06 11:23:23 +02:00
proddy
64a7108e6d make it compile standalone 2022-06-06 11:20:16 +02:00
proddy
cf4818f09c update packages 2022-06-06 11:20:09 +02:00
proddy
98fb970dac add test for #541 2022-06-06 11:19:56 +02:00
Proddy
d162206f75 Merge pull request #540 from MichaelDvP/dev
WebStatus: add syslog count/fail, show only enabled services
2022-06-03 16:08:22 +02:00
MichaelDvP
1609b76f0a WebStatus:add syslog count/fail, show only enabled services 2022-06-03 13:39:26 +02:00
Proddy
794b3c0471 Merge pull request #538 from MichaelDvP/dev
fix #536 and uart task priority
2022-06-03 07:36:49 +02:00
MichaelDvP
e7bcc380e3 fix #536, FR100 datetime not writable 2022-06-02 18:34:02 +02:00
MichaelDvP
fe12f1903d uart higher prriority 2022-06-02 18:33:23 +02:00
Proddy
41ec4b9bcf Merge pull request #537 from proddy/dev
update packages
2022-06-02 14:54:01 +02:00
Proddy
f64dd00cce update packages 2022-06-02 14:53:38 +02:00
Proddy
5ef2f8292c Merge pull request #534 from MichaelDvP/dev
some small corrections
2022-05-30 12:11:14 +02:00
MichaelDvP
ae3ead6b10 some small corrections 2022-05-30 10:00:45 +02:00
Proddy
874f686882 Merge pull request #533 from proddy/dev
chamges for standalone compiling
2022-05-29 21:16:29 +02:00
Proddy
383c30f649 chamges for standalone compiling 2022-05-29 21:16:12 +02:00
Proddy
0b2c95fc4e Merge pull request #532 from MichaelDvP/idf4_no_master
Update to platformio2.3.0/IDF4/Arduino2.0, remove master themostat
2022-05-29 20:42:16 +02:00
MichaelDvP
eacdd62cc8 update changelog 2022-05-29 19:15:45 +02:00
MichaelDvP
a692eb557d Merge branch 'idf4' into idf4_no_master 2022-05-29 19:12:58 +02:00
MichaelDvP
99b6acfc07 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4 2022-05-29 19:07:32 +02:00
Proddy
fa486c8b60 Merge pull request #520 from tp1de/dev
Additions for RC310
2022-05-29 16:28:31 +02:00
Proddy
b19b3e5869 Merge branch 'dev' into dev 2022-05-29 16:28:15 +02:00
Proddy
e6bfd90235 Merge pull request #531 from proddy/dev
3.4.2b2
2022-05-29 16:20:12 +02:00
Proddy
072fe526ea 3.4.2b2 2022-05-29 16:19:55 +02:00
Proddy
e65f5072fe Merge pull request #527 from proddy/dev
various minor changes, including managing hidden entities in customization screen
2022-05-29 16:11:53 +02:00
Proddy
435218888a #513 2022-05-29 14:36:13 +02:00
Proddy
3e7b743dfa updated changelog for 3.4.1 2022-05-29 13:58:01 +02:00
Proddy
c693ef6307 update packages 2022-05-29 13:57:54 +02:00