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
4,258 Commits 5 Branches 25 Tags
f3adc13c6d01c14fe385cc9263368a4ad042d866
Commit Graph

255 Commits

Author SHA1 Message Date
Proddy
f3adc13c6d auto-formatting 2022-10-30 16:44:31 +01:00
MichaelDvP
db6f8eaba1 add boiler heatStarts 2022-10-27 18:50:38 +02:00
pswid
dec3abfab9 Merge branch 'emsesp:dev' into dev 2022-10-24 11:22:24 +02:00
MichaelDvP
d150b017e3 DIV10 for solarTemp 2022-10-17 18:56:54 +02:00
pswid
49414adfd2 Polish translation improvements 
Strange, but if i use capital letters in Polish translation for "ON' and "OFF" (local_translations.h), I'm getting compile error. So instead of whole words in capital letters I used abbreviations in lower case (more useful, IMHO)
 2022-10-17 18:21:57 +02:00
MichaelDvP
dbb2a365cb solar temperature #687 2022-10-17 10:10:42 +02:00
MichaelDvP
7d5e112efb Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev_ 2022-10-11 09:34:56 +02:00
proddy
b67113fc1f use const char * where possible 2022-10-10 20:11:23 +02:00
MichaelDvP
e6d3d347ab remove unused brackets and inits 2022-10-10 14:10:29 +02:00
Proddy
987fcb4a5a Merge remote-tracking branch 'origin/dev' into flash_optimization 2022-10-01 16:48:50 +02:00
MichaelDvP
e450a0e096 fix bool command for hp input #600 2022-10-01 11:21:15 +02:00
Proddy
9b619216cb formatting brackets 2022-09-28 21:46:12 +02:00
Proddy
87d0db0b5c auto formatting 2022-09-28 20:27:48 +02:00
MichaelDvP
732aaffbb6 boiler HP-inputConfig, HeaterConfig, thermostat roomsensor 2022-09-28 16:07:38 +02:00
proddy
777c9db0f6 remove flash 2022-09-28 15:47:27 +02:00
proddy
815397dba6 move device_library name to const char * 2022-09-25 14:36:45 +02:00
Proddy
1a4ce643fc Multi-language/I18n support #22 2022-08-24 21:50:19 +02:00
MichaelDvP
df555acc0e set wwFlowTempOffset to 100 2022-08-11 09:20:15 +02:00
MichaelDvP
f96b13c3cd fix tag of wwStarts2 2022-08-09 08:11:59 +02:00
MichaelDvP
97132a4758 min/max settings for AM200 2022-08-08 09:57:28 +02:00
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