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

2558 Commits

Author SHA1 Message Date
MichaelDvP
d3d9a9300b Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-24 07:15:23 +02:00
Proddy
472b97e89e update to 3.4.1b0 2022-05-23 21:34:00 +02:00
Proddy
b9f63bcfb1 autoformatting 2022-05-23 21:08:00 +02:00
MichaelDvP
c502aa7d1c Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into idf4_no_master 2022-05-23 19:32:08 +02:00
tp1de
2c0c5ba425 emergencyops and emergencytemp for RC310 2022-05-21 13:57:31 +02:00
MichaelDvP
6670dfdf07 formatting 2022-05-21 11:36:38 +02:00
MichaelDvP
b426f4f904 Merge remote-tracking branch 'origin/dev' into idf4_no_master 2022-05-21 11:36:08 +02:00
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
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
353853af14 max must be a integer (changed 19.9 to 20) 2022-05-20 09:58:43 +02:00
tp1de
571f5577d1 wwchargeoptimization UBAParameterWWPlus 2022-05-20 00:10:58 +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
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
fc29a3ad95 replace api/settings and customizatons with secure REST calls #501 2022-05-16 21:30:06 +02:00
MichaelDvP
f3e99f9092 Add HM200 hybrid manager as heatpump 2022-05-15 08:58:28 +02:00
MichaelDvP
1863e57f5b fix #496, RC30 design temp 2022-05-12 18:21:30 +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
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
9c732ae19f uart back 2022-05-10 09:59:04 +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
MichaelDvP
6203eedbe5 uart 2022-05-08 17:27:56 +02:00
Proddy
db8c30ddbb fix for customizations after upload new file 2022-05-08 17:02:38 +02:00
Proddy
0e9202ae4d change to saving customization file after upload 2022-05-08 17:01:38 +02:00
Proddy
8b521aa572 fix standalone compiling 2022-05-08 15:01:04 +02:00
Proddy
1f933fb26a updates for #256 2022-05-08 14:58:41 +02:00
Proddy
0faa56f5ff Merge branch 'emsesp:dev' into dev 2022-05-08 12:57:33 +02:00
MichaelDvP
fdab56936f Merge branch 'dev' into idf4_no_master 2022-05-08 11:35:04 +02:00
MichaelDvP
c0aa263f2b parse_command checks prefix-numbers and prefix id 2022-05-08 11:19:12 +02:00
MichaelDvP
6c151654cc parse_command 2022-05-08 10:33:17 +02:00
Proddy
fd53999777 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2022-05-07 18:40:21 +02:00
Proddy
ce60bd10b6 telnet and analog on by default 2022-05-07 17:50:36 +02:00
Proddy
ee0492771d text change 2022-05-07 17:50:22 +02:00
Proddy
964e75e191 minor change 2022-05-07 17:50:10 +02:00