andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 17:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,733 Commits 5 Branches 25 Tags
8800b88f62b288c8ae91401b48762db2be4eb7b7
Commit Graph

682 Commits

Author SHA1 Message Date
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
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
1863e57f5b fix #496, RC30 design temp 2022-05-12 18:21:30 +02:00
MichaelDvP
d075ee3111 Merge branch 'dev_no_master_thermostat' into idf4_no_master 2022-05-06 12:01:38 +02:00
proddy
56860da4af remove TODO on sorting 2022-04-20 18:06:26 -04:00
Proddy
15f5f55833 Merge branch 'emsesp:dev' into dev 2022-04-19 12:25:11 +02:00
bavo
d76a838165 Increase range for the selected_room_temperature variable 2022-04-19 12:14:38 +02:00
Proddy
9f6bbac8ce formatting 2022-04-18 11:05:38 +02:00
MichaelDvP
a9a11f464b add comment to boiler: hybrid heatpump 2022-04-14 11:59:44 +02:00
MichaelDvP
47410ce6cc Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev_ 2022-04-14 07:38:32 +02:00
MichaelDvP
f9207ecd0f Merge branch 'dev_' into dev_no_master_thermostat 2022-04-14 07:27:07 +02:00
Friso
4cdeef212d fixed T1 to T4 for RC20 2022-04-13 11:18:28 +02:00
Friso
258db5c7e8 disable usage of T0 for RC30 in set_switchtime 2022-04-13 11:09:31 +02:00
Friso
b59ef15cae fixed set_switchtemp, process_RC20Timer 2022-04-13 09:17:22 +02:00
MichaelDvP
94f5d4d503 fix set_switchtime 2022-04-12 18:56:23 +02:00
Friso
9ed2a99f50 fix duplicate functions after rebase 2022-04-12 07:00:41 +02:00
Friso
9f86444e0a Merge branch 'feature/moduline400WWandTimer' of https://github.com/kwertie01/EMS-ESP32 into feature/moduline400WWandTimer 2022-04-12 06:35:33 +02:00
kwertie01
f23bf270d0 fix wrong offset in set_party 2022-04-12 06:34:13 +02:00
kwertie01
8839909425 Added Moduline 400 WW settings and clock program 2022-04-12 06:34:13 +02:00
MichaelDvP
ec1b0b3641 add IPM ww-parameters to mixer 2022-04-11 15:03:07 +02:00
kwertie01
cffc2695dd fix wrong offset in set_party 2022-04-11 11:57:42 +02:00
kwertie01
49eb049533 Added Moduline 400 WW settings and clock program 2022-04-11 11:43:15 +02:00
MichaelDvP
4009a1a25c b12, cleanup, formatting, small fixes 2022-04-11 10:20:40 +02:00
MichaelDvP
eec4d7863d move Hybrid settings to thermostat 2022-04-10 18:25:11 +02:00
MichaelDvP
0d79138e0b product-id 100 is mixer with max wwc10, add handlers_ignored 2022-04-10 14:37:43 +02:00
MichaelDvP
75914da36a thermostat switchpoints allow T1-T4 2022-04-10 14:35:55 +02:00
MichaelDvP
cf876acc5d rename hybrid entities 2022-04-10 14:34:10 +02:00
MichaelDvP
6d6cb755e2 update hybrid heatpump #459 2022-04-10 10:03:36 +02:00
MichaelDvP
f771bb8043 add clock to controller #439 2022-04-08 10:02:24 +02:00
MichaelDvP
f9b2a71b86 tag to wwstarts2, thermostat clock format, formatting 2022-04-08 10:01:46 +02:00
Proddy
1a58f76ab7 Merge pull request #449 from kwertie01/feature/moduline400 
added moduline 400 installation parameters
 2022-04-06 10:15:26 +02:00
kwertie01
2674b3a20e added moduline 400 installation parameters 2022-04-05 08:23:30 +02:00