andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity
7,035 Commits 5 Branches 25 Tags
642f44daaa645e5732b53eeb1a3aa9b6f7711df7
Commit Graph

7035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
proddy
642f44daaa remove TODO 2024-07-02 20:03:25 +02:00
proddy
3309e8c3d6 remove TODO 2024-07-02 20:03:09 +02:00
proddy
c5c5651149 don't include type in name of device (in customization list) 2024-07-01 21:48:40 +02:00
proddy
a28db9369b add comment 2024-07-01 21:48:19 +02:00
proddy
a626ad4af1 add more test data 2024-07-01 21:48:05 +02:00
proddy
fcbd668d7a package update 2024-07-01 21:47:54 +02:00
proddy
2688ed0084 rename Device 2024-07-01 13:43:37 +02:00
Proddy
463fbd69c8 Merge pull request #1831 from proddy/dev 
prep for modbus merge
 2024-06-29 10:06:38 +01:00
proddy
2155c2e70f update for 3.7.0 2024-06-29 11:05:24 +02:00
proddy
47cbbba675 updates 2024-06-29 10:24:14 +02:00
Proddy
66470071f6 Merge pull request #1830 from MichaelDvP/dev 
CR120 fixes #1779
 2024-06-28 20:59:43 +01:00
MichaelDvP
e63090573a CR120: dhw modes off/comfort/auto 2024-06-28 17:51:58 +02:00
MichaelDvP
5a7da199ed fix manualtemp for CR120 #1779 2024-06-28 17:51:37 +02:00
Proddy
03e5834d59 Merge pull request #1802 from SLTKA/feature/pump-characteristic 2024-06-28 14:35:03 +01:00
Proddy
23fdfd4f26 Merge pull request #1829 from proddy/dev 
ArduinoJson 7.1.0
 2024-06-28 08:05:42 +01:00
Proddy
021cf8dd70 Merge branch 'emsesp:dev' into dev 2024-06-28 08:05:17 +01:00
proddy
3a6bbf57ae bump ArduinoJson to 7.1.0 2024-06-28 09:04:30 +02:00
proddy
430bbf9c46 package update (vite) 2024-06-28 09:04:19 +02:00
Proddy
ffb91ce997 Merge pull request #1828 from MichaelDvP/dev 
fixes device redetction, command id -1 #1779
 2024-06-28 07:48:58 +01:00
MichaelDvP
c74ebc8aae log text for command 2024-06-28 07:31:25 +02:00
MichaelDvP
69b6bcfaed Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-06-28 07:27:20 +02:00
MichaelDvP
b2b79734c1 don't update products with valid product-id 2024-06-28 07:25:06 +02:00
MichaelDvP
a9de8ec046 fix ommands with auto-id (-1) 2024-06-28 07:23:12 +02:00
Proddy
ae70ca2079 Merge pull request #1827 from proddy/dev 2024-06-27 15:12:23 +01:00
proddy
eebb8e68f7 match type - rename none to Disabled 2024-06-27 15:12:30 +02:00
proddy
407191b72c added comment 2024-06-27 15:12:06 +02:00
proddy
2097e8e271 remove TODO comments 2024-06-27 14:53:30 +02:00
proddy
139d32c431 stop crashing when ETH used and Analog Sensor is pin 21/SDA or 22/SCC (I2C conflict). Show when its a bad GPIO in log. 2024-06-27 14:52:48 +02:00
proddy
320035fd72 show which IP is for which when both ETH and Wifi and enabled 2024-06-27 14:51:40 +02:00
proddy
ccd4b8917f update packages 2024-06-27 14:51:17 +02:00
proddy
eccca23163 adding spelling to vscode check (optional) 2024-06-27 14:51:08 +02:00
Alexandr Yeskov
deedd49721 feat: Add support for Boiler Pump Characteristic 
This adds support for pump characteristic and pump output settings
for 0xE6 type
 2024-06-27 21:39:49 +10:00
Proddy
95915611b5 Merge pull request #1825 from MichaelDvP/dev 
Scheduler fixes and additions
 2024-06-27 08:14:34 +01:00
MichaelDvP
266a7a4e9b allow multiple instances of "?:" in a schedule 2024-06-27 08:28:38 +02:00
MichaelDvP
a46b9c60dd allow multiple onChange schedules with same trigger #1806 2024-06-27 08:27:16 +02:00
MichaelDvP
03513be144 add heatingactive/tapwateractive to onChange #1806 2024-06-27 08:26:16 +02:00
MichaelDvP
39014a2216 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-06-25 15:28:43 +02:00
MichaelDvP
e5a8fd7be4 german translation #1800 2024-06-25 15:28:05 +02:00
Proddy
a4ad8f551a Merge pull request #1821 from proddy/dev 
minor changes
 2024-06-25 09:53:21 +01:00
proddy
edaeafd619 don't run sonar on pulls 2024-06-25 10:51:08 +02:00
proddy
9a63307b33 updated for dev.18 2024-06-25 10:44:44 +02:00
proddy
18483558d4 lowercase Entities 2024-06-25 10:42:18 +02:00
proddy
2184fbb113 experiment with cache (again) 2024-06-25 10:42:05 +02:00
proddy
4ebd0657f4 include device data in export 2024-06-25 10:41:36 +02:00
Proddy
c7759a71b4 Merge pull request #1820 from proddy/dev 
export DeviceValues and format Device Values window
 2024-06-24 20:53:07 +01:00
proddy
e3b37e8220 rename GitHub 2024-06-24 21:49:29 +02:00
proddy
5f08e218ec formatting 2024-06-24 21:49:21 +02:00
proddy
26eb2a3b29 add button tooltip, also export json 2024-06-24 21:49:06 +02:00
proddy
03933edcae update packages 2024-06-24 21:48:21 +02:00
Proddy
e037c0753d Merge pull request #1819 from proddy/dev 
fix shower duration
 2024-06-23 10:39:33 +01:00