andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-13 13:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,659 Commits 6 Branches 30 Tags
68215f37f55bf79bb352071083c2102cb123ede5
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Proddy 68215f37f5 Merge pull request #924 from proddy/dev 
preparing for 3.5.0 stable
 2023-01-22 13:31:30 +01:00
Proddy 78e6263a2e Merge pull request #923 from MichaelDvP/dev 
fixes and the tested heatpump/heatsource entities
 2023-01-22 13:06:23 +01:00
Proddy 485195e035 Merge pull request #901 from pswid/dev 
added dhw alternating operation
 2023-01-22 10:12:47 +01:00
Proddy 88404bcb56 Merge pull request #887 from proddy/dev 
README update and one change to api_data
 2023-01-05 16:04:01 +01:00
Proddy 74acf2fe0f Merge pull request #885 from proddy/dev 
#872
 2023-01-05 09:45:55 +01:00
Proddy d2e64468d5 Merge pull request #876 from proddy/dev 
Fix Swedish - #874 and #875
 2023-01-01 17:46:46 +01:00
Proddy 6c09134552 Merge pull request #866 from proddy/dev 
add test for #865
 2022-12-30 18:45:11 +01:00
Proddy 2db99a3e32 Merge pull request #864 from proddy/dev 
fix again for #828
 2022-12-30 15:35:01 +01:00
Proddy f055e53987 Merge pull request #858 from proddy/dev 
fix for #828 - show thermostat hc1 and mixer wwc
 2022-12-30 11:48:01 +01:00
Proddy d41e634611 Merge pull request #856 from MichaelDvP/dev 
HA firstrun only delete config, create HA in next loop (mqtt queue)
 2022-12-28 21:05:07 +01:00
Proddy c788f53bb9 Merge pull request #854 from mvjt/dev 
Additional SE translations
 2022-12-28 18:07:56 +01:00
Proddy c4c341922b Merge pull request #851 from proddy/dev 
#828 dump all out entities (standalone only)
 2022-12-28 15:41:07 +01:00
Proddy bb94d56bd0 Merge branch 'emsesp:dev' into dev 2022-12-27 21:19:11 +01:00
Proddy 14f3d9ab12 Merge pull request #849 from MichaelDvP/dev 
fix #846, #848, remove double values hpsuctionGas/hpHotGas, stick to hpTr5/hpTr6
 2022-12-27 21:16:58 +01:00
Proddy 9b66b02e46 Merge branch 'emsesp:dev' into dev 2022-12-27 17:26:00 +01:00
Proddy f53fd74873 Merge pull request #845 from MichaelDvP/dev 
fix copy/paste error
 2022-12-27 11:49:23 +01:00
Proddy ba03add3d3 Merge pull request #842 from MichaelDvP/dev 
fix #841
 2022-12-27 10:27:37 +01:00
Proddy d08a1224e2 Merge pull request #840 from proddy/dev 
added version upgrade/downgrade #832
 2022-12-26 15:07:55 +01:00
Proddy 291da3f7fe Merge pull request #836 from MichaelDvP/dev 
fixes and enhancements #826, #835, #820
 2022-12-24 17:03:01 +01:00
Proddy 290890f6e7 Merge pull request #830 from proddy/dev 
#822 and #829
 2022-12-24 08:09:44 +01:00
Proddy 9802581301 Merge pull request #827 from pswid/dev 
Polish translation update
 2022-12-23 08:01:13 +01:00
Proddy d6de0f6fa8 Merge pull request #825 from pswid/dev 
added "compressor temp." for more hp types
 2022-12-21 09:27:31 +01:00
Proddy 15f0560005 Merge pull request #819 from MichaelDvP/dev 
Some more entities and small fixes
 2022-12-20 10:23:09 +01:00
Proddy 2bdc0d59cf Merge pull request #818 from MichaelDvP/dev 
add step to numeric command-values in HA discovery
 2022-12-18 18:16:36 +01:00
Proddy bc3bdb1221 Merge pull request #817 from MichaelDvP/dev 
Next fixes for #803
 2022-12-18 15:20:04 +01:00
Proddy f72b02ab0b Merge pull request #815 from MichaelDvP/dev 
Additions for #802, #803
 2022-12-17 20:42:05 +01:00
Proddy c0946f1e0c Merge branch 'dev' into dev 2022-12-17 20:41:56 +01:00
Proddy 575fdcb8cd Merge pull request #816 from proddy/dev 
support 3 types of MQTT discovery entity id - #804
 2022-12-17 19:21:36 +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 1aef27da33 Merge branch 'emsesp:dev' into dev 2022-12-15 23:14:20 +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 c26793c68d Merge pull request #801 from MichaelDvP/dev 
delete empty response
 2022-12-12 21:47:40 +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
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 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 ccc9e6dcfb Merge pull request #791 from MichaelDvP/dev 
small changes for #759
 2022-12-05 20:34:20 +01:00
Proddy 2950f167aa Merge pull request #780 from MichaelDvP/dev 
allow raw telegram sending with other src-id
 2022-12-04 13:01:16 +01:00
Proddy afdf9a3dfb Merge pull request #781 from proddy/dev 
#751 and #759
 2022-12-04 13:00:49 +01:00
Proddy 7144c746c6 Merge pull request #779 from proddy/dev 
#751 boot time when NTP connected
 2022-11-28 21:19:18 +01:00
Proddy 12b027110e Merge pull request #778 from MichaelDvP/dev 
Basetranslation, HA-mode fix, analog inputs, etc.
 2022-11-28 09:56:34 +01:00
Proddy 68f1a891ca Merge pull request #776 from proddy/dev 
fix codacy complaining
 2022-11-27 20:44:04 +01:00
Proddy c21b594cf0 Merge pull request #775 from proddy/dev 
minor standalone fixes
 2022-11-27 20:22:56 +01:00
Proddy af8e82a860 Merge pull request #764 from MichaelDvP/dev 
Command `values` for analog/dallas sensors, writeable for analog-out,…
 2022-11-22 22:12:47 +01:00
Proddy dccdf18226 Merge pull request #761 from proddy/dev 
use HA connectivity device class #751
 2022-11-20 20:55:35 +01:00
Proddy a92f287256 Merge branch 'dev' into dev 2022-11-20 20:55:24 +01:00
Proddy a193d67f11 Merge pull request #755 from MichaelDvP/dev 
add devices Alert/Pump, UOMs
 2022-11-20 20:53:22 +01:00
Proddy 1f43bb201c Merge pull request #753 from MichaelDvP/dev 
fixes #747, #748
 2022-11-18 10:19:57 +01:00
Proddy c76b4b9ede Merge pull request #746 from pswid/dev 
completed translations of entities into Polish.
 2022-11-16 16:47:35 +01:00
Proddy 06004ce478 Merge pull request #745 from MichaelDvP/dev 
EN-Tags for HA-entities
 2022-11-14 12:50:10 +01:00
Proddy d3a84e02e4 Merge pull request #743 from MichaelDvP/dev 
Typos, selflowtemp check
 2022-11-13 19:56:32 +01:00
Proddy 92ac601072 Merge pull request #733 from pswid/dev 
fix: cosmetic webUI improvements
 2022-11-13 14:17:59 +01:00
Proddy 8ed789892b Merge pull request #741 from proddy/dev 
minor updates, also implements #707
 2022-11-10 16:12:21 -05:00
Proddy 96bb3013a3 Merge pull request #740 from MichaelDvP/dev 
fix render_value float, leading zeros to decimals
 2022-11-10 06:36:37 -05:00
Proddy 551497bfeb Merge pull request #739 from MichaelDvP/dev 
fix #736
 2022-11-09 14:04:21 -05:00
Proddy b91e474343 Merge pull request #734 from MichaelDvP/dev 
fix #727 boiler wwcircmode
 2022-11-07 16:47:15 +01:00
Proddy 757fcd3ea4 Merge pull request #730 from proddy/dev 
fix sensor writing
 2022-11-06 18:04:08 +01:00
Proddy 6a291ef1e2 Merge pull request #726 from proddy/dev 
add missing elint supression to fix build
 2022-11-05 18:34:08 +01:00
Proddy 05d393e7fe Merge pull request #725 from proddy/dev 
minor fixes for standalone
 2022-11-05 18:27:32 +01:00
Proddy b0ae22d493 Merge pull request #724 from proddy/dev 
build web i18n on github actions
 2022-11-05 18:02:37 +01:00
Proddy e58491ed97 Merge pull request #722 from MichaelDvP/dev 
Changes in discussion
 2022-11-05 17:52:15 +01:00
Proddy 6883dbbce1 Merge pull request #723 from proddy/dev 
fix to base translations, auto generate i18n
 2022-11-05 14:00:08 +01:00
Proddy 825836c447 Merge pull request #721 from proddy/dev 
formatting, updated packages, fix dialog focus on customization screen
 2022-11-03 22:30:43 +01:00
Proddy 0bc3a3c34e Merge pull request #719 from pswid/dev 
fix to the translation of the webUI in Polish.
 2022-11-03 20:35:08 +01:00
Proddy bdce4ee9f9 Merge pull request #718 from MichaelDvP/dev 
fix #717, rounding error
 2022-11-01 18:09:31 +01:00
Proddy 2c056d6807 Merge pull request #715 from proddy/dev 
minor changes
 2022-10-31 20:56:54 +01:00
Proddy 3baedf01d1 Merge pull request #713 from MichaelDvP/dev 
min/max, bus-ids, MD5
 2022-10-31 19:28:54 +01:00
Proddy e45c31345e Merge pull request #712 from proddy/dev 
auto-formatting web code
 2022-10-30 16:56:48 +01:00
Proddy 23cd677133 Merge branch 'emsesp:dev' into dev 2022-10-30 16:56:13 +01:00
Proddy 5199edff1e Merge pull request #711 from proddy/dev 
minor updates
 2022-10-30 16:47:08 +01:00
Proddy 03564b3a82 Merge pull request #708 from mvjt/dev 
Translated new index.ts items to Swedish
 2022-10-30 16:14:13 +01:00
Proddy ed81e095ee Merge pull request #702 from pswid/dev 
The translation of the web interface into Polish has been corrected and completed (e.g. the word order has been fixed).
 2022-10-29 11:03:24 +02:00
Proddy 76734b77f1 Merge pull request #706 from MichaelDvP/dev 
fixes #704 and #698
 2022-10-29 10:56:13 +02:00
Proddy c3cfed5ac3 Merge pull request #700 from proddy/dev 
package update
 2022-10-24 13:30:57 -07:00
Proddy d9bbf35afc Merge pull request #693 from pswid/dev 
Polish translation improvements
 2022-10-24 13:29:11 -07:00
Proddy 8b10970e03 Merge pull request #696 from MichaelDvP/dev 2022-10-18 10:09:48 +02:00
Proddy 26208103fc Merge pull request #694 from MichaelDvP/dev 
DIV10 for solarTemp
 2022-10-17 19:07:25 +02:00
Proddy 5c675c7ce7 Merge pull request #690 from MichaelDvP/dev 
solar temperature sensor and some fixes
 2022-10-17 15:00:47 +02:00
Proddy 52a8c7288d Merge pull request #685 from MichaelDvP/dev 
small fixes
 2022-10-14 16:52:37 +02:00
Proddy e5e058672d Merge pull request #683 from pswid/dev 
Added Polish names of the entities
 2022-10-14 12:08:13 +02:00
Proddy fd2cc8aff1 Merge pull request #684 from proddy/dev 
update standalone build
 2022-10-13 22:07:49 +02:00
Proddy 8d290317d7 Merge pull request #677 from MichaelDvP/dev_ 
C3/S2 support, tags translated
 2022-10-13 21:40:14 +02:00
Proddy b59a552288 Merge pull request #680 from pswid/dev 
Polish translation improvements
 2022-10-11 18:41:15 +02:00
Proddy def67899ed Merge pull request #679 from tefracky/tefracky-german-translation 
Updated German translation
 2022-10-11 18:40:41 +02:00
Proddy 887a245d82 Merge pull request #676 from proddy/dev 
NO and Commands translations
 2022-10-11 08:28:12 +02:00
Proddy 87dfffeddb Merge pull request #672 from proddy/dev 
fix REST-API - strange characters in description
 2022-10-09 19:41:46 +02:00
Proddy fd5fcf356f Merge pull request #667 from ajvdw/dev 
Added support for ESP32-S2
 2022-10-07 21:11:36 +02:00
Proddy 73f7603c1d Merge pull request #668 from MichaelDvP/dev 
Float rendering and Junkers FW500
 2022-10-07 21:05:58 +02:00
Proddy 4489e7149c Merge pull request #664 from MichaelDvP/dev 
add controller BC30, #663
 2022-10-05 18:20:21 +02:00
Proddy 9f5a5108fb Merge pull request #662 from MichaelDvP/dev 
fix #659, mqtt bool values
 2022-10-05 12:09:33 +02:00
Proddy f2f10f0c79 Merge pull request #661 from pswid/dev 
Polish translation improvements
 2022-10-04 21:04:17 +02:00
Proddy 1accdfcafb Merge pull request #660 from MichaelDvP/dev 
Climate min/max #647, RC300 CalIntTemp #657
 2022-10-04 21:01:59 +02:00
Proddy 246684f28c Merge pull request #651 from MichaelDvP/dev 
add missing fahrenheits on customization screen
 2022-10-01 11:59:48 +02:00
Proddy 3bca7c9a13 Merge pull request #650 from MichaelDvP/dev 
custom min/max
 2022-09-28 21:20:08 +02:00
Proddy 01f361e7cd Merge pull request #643 from mvjt/dev 
Polishing Swedish Translations
 2022-09-25 11:46:26 +02:00
Proddy 1278776297 Merge pull request #642 from proddy/dev 
update to commands in web
 2022-09-25 11:46:01 +02:00
Proddy d8144c901d Merge pull request #640 from MichaelDvP/dev 
mqtt ha settings, show memory in KB, etc.
 2022-09-24 17:40:07 +02:00
Proddy 30109a54ce Merge pull request #639 from proddy/dev 
fix missing NL translations
 2022-09-24 16:09:05 +02:00
Proddy 12638275fa Merge pull request #633 from tefracky/pull-request-german-translation 
Fixed German translation typos
 2022-09-22 19:03:36 +05:30
Proddy 25c50435ca Merge pull request #632 from MichaelDvP/dev 
fix #631, negative multiplicator
 2022-09-22 19:03:04 +05:30
Proddy fb998a7e6a Merge pull request #630 from MichaelDvP/dev 2022-09-20 22:23:01 +05:30