andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
4,472 Commits 5 Branches 25 Tags
94b75dda24505de9530c516a259fbda70ad76918
Commit Graph

4472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP
94b75dda24 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-12-17 11:14:53 +01:00
MichaelDvP
a529879889 some aux heater trnlations 2022-12-17 11:10:23 +01:00
Proddy
88c98efd94 Merge pull request #808 from proddy/dev 
add v3.4 entity id flag to MQTT settings
 2022-12-17 11:04:42 +01:00
Proddy
4b7bbb3d50 minor cleanup and testing 2022-12-17 11:05:20 +01:00
Proddy
147be12583 fixes for #804 2022-12-16 22:57:59 +01:00
MichaelDvP
137e047205 auxheaterdelay and hyst #803 2022-12-16 15:11:56 +01:00
MichaelDvP
4bd6db31c0 Merge branch 'dev' of https://github.com/proddy/EMS-ESP32 into dev 2022-12-16 11:10:58 +01:00
MichaelDvP
1350638fb3 rename auxheater 2022-12-16 11:10:37 +01:00
Proddy
b6de431a56 add French MQTT entity format strings (in EN) 2022-12-15 23:19:53 +01:00
Proddy
1aef27da33 Merge branch 'emsesp:dev' into dev 2022-12-15 23:14:20 +01:00
Proddy
1e78979ed0 default multiple_instances is enabled 2022-12-15 23:14:44 +01:00
Proddy
ba90ebda4c merge multiple_instances with entity_format 2022-12-15 21:51:11 +01:00
MichaelDvP
7c1bade54d add auxilliary heater setting #803 2022-12-15 13:22:54 +01:00
MichaelDvP
a46b394714 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-12-15 10:21:22 +01:00
Proddy
6dff1136c5 Merge pull request #807 from PopaSchKing/dev 
Add FR language to EMS-ESP
 2022-12-15 09:45:25 +01:00
Proddy
ccbb56d403 add v3.4 entity id flag to MQTT settings 2022-12-14 22:07:42 +01:00
PopaSchKing
4f3a7e5451 Fix missing elements from merge with off. dev branch 2022-12-14 19:06:02 +01:00
MichaelDvP
e4cda4087e Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-12-14 18:52:37 +01:00
MichaelDvP
6eeb8de02c fix #806 2022-12-14 18:46:29 +01:00
PopaSchKing
29c4fec90a Update changelog 2022-12-14 17:48:59 +01:00
MichaelDvP
5c9ba8de43 fetch heatpump telegrams 2022-12-14 17:27:45 +01:00
PopaSchKing
2358f6a9c9 Merge branch 'emsesp:dev' into dev 2022-12-14 17:16:13 +01:00
PopaSchKing
7097279dca Fix wrong language name 2022-12-14 16:02:09 +01:00
MichaelDvP
c3eb553425 UOMs 2022-12-14 15:53:40 +01:00
PopaSchKing
24f64fac6b Update FR 2022-12-14 15:39:23 +01:00
MichaelDvP
4cdd5e9f20 add values/settings #803 2022-12-14 14:20:32 +01:00
MichaelDvP
de9e261807 Test for #802 2022-12-13 11:43:37 +01:00
Proddy
c26793c68d Merge pull request #801 from MichaelDvP/dev 
delete empty response
 2022-12-12 21:47:40 +01:00
MichaelDvP
11fd833cdb delete empty response 2022-12-11 11:13:56 +01:00
Proddy
2b21a0c31f Merge pull request #800 from MichaelDvP/dev 
Avoid blank page (NULL) as response
 2022-12-10 20:23:07 +01:00
MichaelDvP
7e888f6408 Avoid blank page (NULL) as response 2022-12-10 18:14:10 +01:00
Proddy
bba70ce852 replace HA ~ with hardcoded base name 2022-12-10 11:58:32 +01:00
Proddy
e96b5af0c8 HA ems_esp status to system_status to be uniform with the other naming conventions 2022-12-10 11:58:00 +01:00
Proddy
5f5e786c0e added comments 2022-12-10 11:57:17 +01:00
Proddy
8d66e43117 Merge pull request #798 from proddy/dev 
minor updates and renaming system status entity in HA
 2022-12-10 11:57:03 +01:00
Proddy
ccbc809ecf upgrade packages 2022-12-10 11:56:39 +01:00
Proddy
e67fde24f1 formatting 2022-12-10 11:56:28 +01:00
Proddy
923494fdce mention breaking change in HA entity names 2022-12-10 11:55:59 +01:00
MichaelDvP
73bff2cabe Merge pull request #797 from MichaelDvP/dev 
Some actual additions/changes, see description
 2022-12-09 10:11:40 +01:00
PopaSchKing
c20fc5a345 Update FR translations 2022-12-08 19:28:38 +01:00
MichaelDvP
f71c62f167 restart when changing CORS settings 2022-12-08 16:54:27 +01:00
SchKing
bdaf9e6dc6 Add FR language 2022-12-07 22:26:09 +01:00
MichaelDvP
a2730fb17c extra debug message for payload only ifdef EMSESP_DEBUG 
Signed-off-by: MichaelDvP <github@mdvp.de>
 2022-12-07 19:13:43 +01:00
MichaelDvP
5061ddf38e add CORS option to network 2022-12-07 13:51:53 +01:00
MichaelDvP
1735c036cc move multiple instances setting to HA section 2022-12-07 13:10:31 +01:00
MichaelDvP
fa703db41e heartbeat time in standalone 2022-12-07 12:53:35 +01:00
MichaelDvP
9665f4136a Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2022-12-07 07:41:25 +01:00
Proddy
abeef2be4a Merge pull request #793 from proddy/dev 
option to enable multiple instances using a flag
 2022-12-06 17:36:37 +01:00
Proddy
995420354e remove breaking change note about MQTT discovery 2022-12-06 11:15:14 +01:00
proddy
1af1a1863a #759 add option to enable multiple instances to keep backward compatibllity with v3.4 2022-12-05 21:33:10 +01:00