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
7,147 Commits 6 Branches 30 Tags
dae1d4e3a8091c5739894e451dedbbce3f424f7c
Commit Graph
7147 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP c40625d658 Conditions, v3.7.0-test.15 2024-06-20 15:46:08 +02:00
MichaelDvP 6c111c7816 Scheduler conditions: allow system 2024-06-20 15:44:02 +02:00
MichaelDvP 95d404551c Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into feat_conditions 2024-06-20 14:51:56 +02:00
MichaelDvP 240137d3a2 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-06-20 14:51:23 +02:00
MichaelDvP fbc3807daa update packages, arduino test 2024-06-20 14:50:25 +02:00
Proddy 6ffc466dff Merge pull request #1809 from proddy/dev 
fix sonar again
 2024-06-20 08:35:35 +01:00
proddy 8f1d5e4752 fix sonar again 2024-06-20 08:35:06 +01:00
Proddy 19c93e25ef Merge pull request #1807 from proddy/dev 
#1801 shower_duration_min
 2024-06-20 08:17:16 +01:00
proddy fc54d6a289 dev15, update chngelog 2024-06-20 08:15:07 +01:00
proddy 1364fcca52 120 seconds for shower_min_duration 2024-06-19 20:08:03 +01:00
proddy 20beda740a shower_min_duration #1801 2024-06-19 18:18:00 +01:00
proddy 9a085c8961 remove unused pragma 2024-06-19 18:15:26 +01:00
proddy e6ccee1bf2 update sonar 2024-06-19 18:14:44 +01:00
proddy d975e1b6da use arduino 2.0.17, not 3.0.1 2024-06-19 18:14:26 +01:00
proddy c9a8d6aeb0 update packages 2024-06-19 18:14:07 +01:00
MichaelDvP b1750265aa back to arduino core 2.xx 2024-06-19 11:46:20 +02:00
MichaelDvP 03496acd22 back to arduino 2.xx 2024-06-19 11:38:07 +02:00
MichaelDvP bae5a11264 schedule conditions chack numbers and strings, fix custom commands 2024-06-18 18:23:08 +02:00
Proddy 912826d20e Merge pull request #1805 from MichaelDvP/dev 
add model() for CR120 for different modes
 2024-06-17 18:51:25 +01:00
MichaelDvP f76c5f6afe Merge branch 'dev' into feat_conditions 2024-06-17 16:00:26 +02:00
MichaelDvP 644a694ed2 add model() for CR120 for different modes 2024-06-17 16:00:01 +02:00
MichaelDvP fc75824921 scheduler: onChange and conditions 2024-06-15 20:00:08 +02:00
Proddy 55316334d4 Merge pull request #1803 from MichaelDvP/dev 
fix #1800
 2024-06-15 16:31:10 +02:00
MichaelDvP ffb7fd3f12 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-06-15 13:47:49 +02:00
Proddy 0b6f7527e5 Merge pull request #1799 from proddy/dev 
add Makefile back so sonar tests run again
 2024-06-14 23:19:18 +02:00
proddy f94bbcaf39 remove obsolete file 2024-06-14 23:18:30 +02:00
proddy c7b7952303 add Makefile back - needed for sonar 2024-06-14 23:18:19 +02:00
proddy d9906b0da4 update packages 2024-06-14 23:17:45 +02:00
Proddy 9bfdb69012 Merge pull request #1798 from proddy/dev 
formatting, fix MQTT HA
 2024-06-14 12:33:44 +02:00
proddy 1c7c2a7f83 resolve lint warnings 2024-06-14 12:29:42 +02:00
proddy ff49caaada make copy of state in creating HA's avty_json as string would go out of scope 2024-06-14 11:48:12 +02:00
proddy 13eee19981 update packages 2024-06-14 11:47:26 +02:00
proddy 3d335963b9 color restart button 2024-06-14 11:47:04 +02:00
proddy 9989a03993 remove base() as it's unused 2024-06-14 11:40:49 +02:00
proddy c9148b574f default EMSESP_DEFAULT_ENTITY_FORMAT is 1 (SINGLE_SHORT) 2024-06-14 11:40:32 +02:00
Proddy 74e0123475 Merge pull request #1793 from proddy/dev 
Modules
 2024-06-13 22:20:25 +02:00
proddy 28abf579e8 process all modules before showing error 2024-06-13 21:11:49 +02:00
proddy c044e1a221 dev.13 2024-06-13 21:11:31 +02:00
proddy ce4957f087 update packages 2024-06-13 21:11:19 +02:00
proddy 53837e36b4 lint fixing 2024-06-12 20:57:50 +02:00
proddy 07dbe7d260 update packages 2024-06-12 10:24:23 +02:00
proddy e56263eb51 update example 2024-06-12 10:23:52 +02:00
proddy 9e2b6a2963 rename standalone to native 2024-06-12 10:23:43 +02:00
proddy b4a8d3c181 pull MAC from efuse 2024-06-12 10:23:26 +02:00
proddy 509c7ee900 text changes 2024-06-12 10:22:53 +02:00
proddy 9e1d9431c1 remove getMacAddress 2024-06-12 10:22:44 +02:00
proddy b92607f0e9 use total for energyLastHour instead 2024-06-12 10:22:11 +02:00
proddy dcb83989c8 removed as it's old 2024-06-12 10:21:39 +02:00
proddy 9331a6e7a1 fixes #1796 2024-06-12 08:44:55 +02:00
Proddy caa6a0b7ae Merge pull request #1792 from proddy/feat_modules 
Feat modules
 2024-06-09 14:03:45 +02:00