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,969 Commits 5 Branches 25 Tags
308b8fb7792b3d23ff148fefa147eeaf88b5153f
Commit Graph

235 Commits

Author SHA1 Message Date
MichaelDvP
308b8fb779 fix position of am200 mixingvalves 2022-08-05 06:49:04 +02:00
MichaelDvP
fb940269de AM200 settings #573 2022-07-30 14:50:23 +02:00
MichaelDvP
94afd8a3a6 rename telegrams am200 2022-07-27 07:34:16 +02:00
MichaelDvP
0d69a0a3db add ahs valve positions 0-100% 2022-07-26 07:06:25 +02:00
Proddy
d0bcbb8d1b Merge pull request #585 from MichaelDvP/dev 
AM200, EM10 changes
 2022-07-23 14:55:29 +02:00
MichaelDvP
8ebefebb0a don't show AM200 valves with unknown offset 2022-07-22 16:16:33 +02:00
Proddy
505e339406 testing coldshot 2022-07-22 15:56:45 +02:00
MichaelDvP
295bbed4ae fix #581 2022-07-21 17:49:38 +02:00
MichaelDvP
ebc5cfa2d8 add tag "ahs" for alternative heating source 2022-07-19 07:50:37 +02:00
MichaelDvP
78dee6c7fe AM200 temperatures 2022-07-18 20:04:56 +02:00
MichaelDvP
c765a274b2 AM200, first test 2022-07-18 17:20:05 +02:00
MichaelDvP
0e563e91b1 burner max power to 254%, fix #553 2022-06-21 06:37:47 +02:00
MichaelDvP
cec1fce745 fix #549, set minimum emergencyTemp to 15°C 2022-06-15 09:56:25 +02:00
MichaelDvP
ae3ead6b10 some small corrections 2022-05-30 10:00:45 +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
b426f4f904 Merge remote-tracking branch 'origin/dev' into idf4_no_master 2022-05-21 11:36:08 +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
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
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
d075ee3111 Merge branch 'dev_no_master_thermostat' into idf4_no_master 2022-05-06 12:01:38 +02:00
MichaelDvP
a9a11f464b add comment to boiler: hybrid heatpump 2022-04-14 11:59:44 +02:00
MichaelDvP
f9207ecd0f Merge branch 'dev_' into dev_no_master_thermostat 2022-04-14 07:27:07 +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
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
f9b2a71b86 tag to wwstarts2, thermostat clock format, formatting 2022-04-08 10:01:46 +02:00
MichaelDvP
55d7ef1036 boiler Errormessage 0xBF to trigger 0xC2 reading 2022-03-30 15:56:05 +02:00
MichaelDvP
4a132e769c fix publish reset 2022-03-21 13:50:54 +01:00
MichaelDvP
d56cdeec77 add burner stage 2 working time, #392 2022-03-11 13:25:18 +01:00
MichaelDvP
5634f46bd5 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev_no_master_thermostat 2022-03-08 10:53:13 +01:00
proddy
c1edbbf047 sonar fixes 2022-03-05 14:25:35 +01:00
MichaelDvP
57582aa90d add boiler_data_ww 2022-03-01 14:47:57 +01:00
MichaelDvP
732dced999 resort tags, boiler ww extra 2022-02-28 16:13:32 +01:00
MichaelDvP
6b164b5487 burner up to 130% 2022-02-16 18:57:43 +01:00
proddy
718f9a4f11 fixes #314 2022-02-12 15:03:31 +01:00
proddy
77e1898512 Merge remote-tracking branch 'origin/v3.4' into dev 2022-01-23 17:56:52 +01:00
pswid
92da61376b Update boiler.cpp 2021-12-03 09:04:39 +01:00
pswid
3c6fd0c83a Update boiler.cpp 2021-12-03 08:58:19 +01:00
proddy
1b86314a14 formatting 2021-11-25 09:13:22 +01:00
pswid
4fd1d8e08a Boiler last error code change 2021-11-23 19:11:35 +01:00