andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity
3,908 Commits 5 Branches 25 Tags
84f643e461a46655538f3a0b9c40d72c8d94e31b
Commit Graph

3908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tp1de
5ab22af9c3 correct boilers.h 2022-05-20 16:55:16 +02:00
tp1de
4263860760 Merge branch 'dev' of https://github.com/tp1de/EMS-ESP32 into dev 2022-05-20 15:14:10 +02:00
MichaelDvP
9a3668c16b Merge remote-tracking branch 'origin/dev' into idf4 2022-05-20 14:39:36 +02:00
MichaelDvP
3a538a97d6 Merge remote-tracking branch 'proddy/dev' into idf4_no_master 2022-05-20 13:24:05 +02:00
tp1de
c637dcbbd8 wwmaxtemp for RC310 2022-05-20 13:14:09 +02:00
Proddy
6c68f2950a Merge pull request #512 from proddy/dev 
text changes, new screenshots
 2022-05-20 12:48:44 +02:00
Proddy
9310f606ad change tooltips #504 2022-05-20 12:47:54 +02:00
Proddy
7ea6c542cf updated screenshots 2022-05-20 12:40:34 +02:00
Proddy
5b4c5b063d increase # devices supported 2022-05-20 12:40:27 +02:00
Proddy
8afb5b3a7c formatting 2022-05-20 12:40:07 +02:00
Proddy
8fbe2199f4 Merge pull request #510 from tp1de/dev 
New entities for RC310 EMS+ Heating systems
 2022-05-20 12:35:03 +02:00
Proddy
62a5254add Merge pull request #506 from MichaelDvP/dev 
summermode for heatpump and HM200 hybridmodule
 2022-05-20 10:42:27 +02:00
Proddy
ab5ba6fc80 Merge pull request #511 from proddy/dev 
minor updates
 2022-05-20 09:59:34 +02:00
Proddy
f9d46904f6 updated URL for api/system/info 2022-05-20 09:59:15 +02:00
Proddy
6545dbd483 updated packages 2022-05-20 09:58:53 +02:00
Proddy
353853af14 max must be a integer (changed 19.9 to 20) 2022-05-20 09:58:43 +02:00
tp1de
6fef3990a7 locale_EN.h 2022-05-20 00:13:56 +02:00
tp1de
571f5577d1 wwchargeoptimization UBAParameterWWPlus 2022-05-20 00:10:58 +02:00
Thomas
e2de89c763 Update locale_EN.h 2022-05-19 23:29:20 +02:00
tp1de
c481e1fe0f wwcomfort1 for UBAParameterWWPlus (RC310) 2022-05-19 16:59:03 +02:00
tp1de
9034c16e27 wwFlowTempOffset RC310 2022-05-18 18:11:17 +02:00
MichaelDvP
95927fc5d8 Merge branch 'idf4' into idf4_no_master 2022-05-18 18:03:31 +02:00
MichaelDvP
4023d7856b NPM update 2022-05-18 17:45:04 +02:00
MichaelDvP
8307753d53 fix uart crash with dev platform 2022-05-18 17:18:01 +02:00
MichaelDvP
c7fb339ee9 Merge branch 'dev' into idf4 2022-05-18 17:09:38 +02:00
MichaelDvP
ca50c5178a fix typos 2022-05-18 17:04:54 +02:00
MichaelDvP
33e58ec45a RC30 designtemp write, 2.fix #496 2022-05-18 07:05:11 +02:00
MichaelDvP
e175b5a5a2 heatpump summermode -> heatpump operatingsmode 2022-05-17 20:53:22 +02:00
MichaelDvP
6072606918 heatpump summer mode, fix #503 2022-05-17 12:50:34 +02:00
MichaelDvP
3a04e891b4 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-05-17 12:21:51 +02:00
Proddy
862cc8d982 Merge pull request #502 from proddy/dev 
#501
 2022-05-16 21:30:40 +02:00
Proddy
fc29a3ad95 replace api/settings and customizatons with secure REST calls #501 2022-05-16 21:30:06 +02:00
Proddy
ae9af3bf0b update packages 2022-05-16 21:29:39 +02:00
Proddy
1bdaaf0d0e Merge branch 'emsesp:dev' into dev 2022-05-15 10:44:52 +02:00
MichaelDvP
f3e99f9092 Add HM200 hybrid manager as heatpump 2022-05-15 08:58:28 +02:00
Proddy
ba315f2159 Merge pull request #497 from MichaelDvP/dev 
fix #496, RC30 design temp
 2022-05-14 21:06:39 +02:00
MichaelDvP
1863e57f5b fix #496, RC30 design temp 2022-05-12 18:21:30 +02:00
MichaelDvP
a0454943a7 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4_no_master 2022-05-10 14:01:31 +02:00
MichaelDvP
a3130d498e Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4 2022-05-10 13:44:22 +02:00
MichaelDvP
3168438d6f LITTLEFS->LittleFS 2022-05-10 13:26:50 +02:00
MichaelDvP
9202d799c6 npm update 2022-05-10 13:26:35 +02:00
MichaelDvP
c9f10fb5cc uart isr to IRAM 2022-05-10 12:42:46 +02:00
MichaelDvP
b3fde5a2da Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into idf4 2022-05-10 12:40:45 +02:00
MichaelDvP
8339fc735c uart in IRAM 2022-05-10 12:36:42 +02:00
MichaelDvP
3e2f7a5976 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-10 09:59:15 +02:00
MichaelDvP
9c732ae19f uart back 2022-05-10 09:59:04 +02:00
Proddy
7e26c0633a Merge branch 'emsesp:dev' into dev 2022-05-08 20:14:16 +02:00
Proddy
226a557d5c prevent build failing 2022-05-08 20:13:48 +02:00
Proddy
08021138ae Merge branch 'emsesp:dev' into dev 2022-05-08 20:11:32 +02:00
MichaelDvP
b16fa6d5c0 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-08 18:21:48 +02:00