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,160 Commits 5 Branches 25 Tags
58aacc189fd8dba272e37b5bc6fd0d175c3b087c
Commit Graph

7160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MichaelDvP
c527d006dd show Boiler/HP on web pages 2024-07-04 15:46:47 +02:00
MichaelDvP
81d97405f9 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev 2024-07-04 14:43:48 +02:00
MichaelDvP
827b7fc370 show RC20 roomtemp in remote 2024-07-04 14:15:36 +02:00
MichaelDvP
2b4b2881c9 changelog v3.7.0-dev.22 2024-07-04 13:47:13 +02:00
MichaelDvP
cee2d5ca31 change temperaturesensor id to underscore notation 2024-07-04 13:42:23 +02:00
MichaelDvP
147804b4b8 change remotetemp to CMD 2024-07-04 13:41:17 +02:00
MichaelDvP
a211f95758 control setting BC400 #1838 2024-07-04 13:02:05 +02:00
Proddy
6b6224dead Merge pull request #1840 from mheyse/fix/check-parameter-order 
fix: nullptr linter error
 2024-07-04 10:02:31 +02:00
mheyse
8c810f2276 fix nullptr linter error 2024-07-04 09:00:12 +02:00
Proddy
a0ca1ce87c Merge pull request #1839 from proddy/dev 
minor updates for modbus
 2024-07-03 22:40:54 +02:00
proddy
12a4942714 minor updates for modbus 2024-07-03 22:39:41 +02:00
Proddy
9277efd1d7 Merge pull request #1832 from mheyse/feat/modbus 
feat: add Modbus support
 2024-07-03 22:14:37 +02:00
mheyse
0c76a249e3 feat: add Modbus support 2024-07-03 15:27:37 +02:00
Proddy
217d90629a Merge pull request #1834 from proddy/dev 
Allow device name to be customized
 2024-07-03 13:29:44 +02:00
proddy
807804ca90 update tasmota for 4mb builds 2024-07-03 11:42:33 +02:00
proddy
307c196046 #1174 - include translated device type name in dropdown 2024-07-03 11:19:41 +02:00
proddy
0aa8e138b5 update package 2024-07-03 11:19:18 +02:00
proddy
03ef598b42 update package 2024-07-03 11:19:09 +02:00
proddy
86f6e0a2fd add TODO as reminder 2024-07-02 20:05:52 +02:00
proddy
3ae48f4d16 Feature: Allow device name to be customized #1174 2024-07-02 20:05:39 +02:00
proddy
46b79f4819 use name() function instead of name_ 2024-07-02 20:04:46 +02:00
proddy
20381e5e09 auto-formatting 2024-07-02 20:04:23 +02:00
proddy
259cba8aa9 load customization before loading devices 2024-07-02 20:04:11 +02:00
proddy
9a01feafd1 move DEBUG msg 2024-07-02 20:03:49 +02:00
proddy
ab24528582 bump dev.20 2024-07-02 20:03:37 +02:00
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