andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-09 17:29:50 +03:00
Code Issues Packages Projects Releases Wiki Activity
6,135 Commits 5 Branches 25 Tags
72f4d00cb3083f2f9ada9479ceb58b04bf2fc698
Commit Graph

6135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
proddy
64471e4c0e dev.10 2023-11-16 22:07:00 +01:00
proddy
28a7ceb6aa fix build on osx - see https://docs.platformio.org/en/latest/projectconf/sections/env/options/build/build_flags.html#stringification 2023-11-16 22:06:43 +01:00
MichaelDvP
0a10e78bfd Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-16 09:14:25 +01:00
Proddy
e4a899912c Merge pull request #1430 from proddy/dev 
fix for export_values and new command_allvalues()
 2023-11-16 07:41:26 +01:00
proddy
cc9819b56b fix lint compile warnings 2023-11-15 21:40:49 +01:00
proddy
29f86c9ab9 make standalone work 2023-11-15 21:40:38 +01:00
proddy
722ca34a18 rollback and fix https://github.com/emsesp/EMS-ESP32/pull/1426 2023-11-15 21:40:23 +01:00
MichaelDvP
50777bd681 temporary fix for values/info command 2023-11-15 19:11:59 +01:00
Proddy
2f5558c311 Merge pull request #1429 from proddy/dev2 
in sync with dev
 2023-11-15 18:23:19 +01:00
Proddy
21c3fe5d8e in sync with dev 2023-11-15 18:22:12 +01:00
MichaelDvP
acb453bd4b fix water: retValve and circ time control 2023-11-15 18:13:43 +01:00
Proddy
bc39b738e2 auto formatting 2023-11-15 17:56:23 +01:00
Proddy
1ada18ec9a 3.6.3-dev.9 2023-11-15 17:56:15 +01:00
Proddy
6b9dadc0d9 Merge pull request #1428 from MichaelDvP/dev2x 
latest changes
 2023-11-15 12:08:18 +01:00
MichaelDvP
cf89a06437 do not remove fetches 2023-11-15 11:48:18 +01:00
MichaelDvP
4a1ea99ee7 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2x 2023-11-15 11:31:58 +01:00
MichaelDvP
3dbf8a0fd1 fix crash on wrong input for switchtime 2023-11-15 11:31:51 +01:00
MichaelDvP
9c6b9a5359 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-15 11:27:19 +01:00
MichaelDvP
0d07a9e50c add some water entities 2023-11-15 11:26:45 +01:00
Proddy
7b5a37a85d Merge pull request #1426 from proddy/dev 
fix bug when traversing ems devices when using cmd allvalues
 2023-11-15 09:50:40 +01:00
Proddy
0b5a7b9f2a fix bug when traversing ems devices when using cmd allvalues 2023-11-14 22:24:32 +01:00
Proddy
0f99415bbf add comments 2023-11-14 22:24:09 +01:00
Proddy
c9775c1edd Merge pull request #1425 from proddy/dev 
only send command and value to backend write service
 2023-11-14 21:41:59 +01:00
Proddy
1f1b571e91 update packages 2023-11-14 18:51:35 +01:00
Proddy
21e28e970c only send command and value to backend write service 2023-11-14 18:51:20 +01:00
MichaelDvP
f9e1940c7b fix crash on entering wrong day for switchtime 2023-11-14 18:11:32 +01:00
MichaelDvP
72c0625823 Merge branch 'dev2x' into dev2 2023-11-14 10:57:43 +01:00
MichaelDvP
4f1ef297c7 thermostat RC300 mode 2023-11-14 10:53:27 +01:00
MichaelDvP
3b30083e7c fix extension module 2023-11-14 10:52:39 +01:00
MichaelDvP
50590f4924 console api_data 2023-11-14 10:52:23 +01:00
MichaelDvP
fae876d7d2 Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2x 2023-11-14 10:12:11 +01:00
MichaelDvP
c1dabddf21 Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2x 2023-11-14 10:12:02 +01:00
MichaelDvP
6926f6fd0b Merge branch 'dev2' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-14 10:07:19 +01:00
MichaelDvP
e30c476e5c Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2 2023-11-13 19:52:50 +01:00
MichaelDvP
509122bf4b fix RC300 wwdisinfectTime 2023-11-13 19:29:03 +01:00
MichaelDvP
84fab951ba fix RC300 summertemp, mode 2023-11-13 18:01:14 +01:00
Proddy
a8ea6ef4a8 Merge pull request #1422 from ellepdesk/options-invert-pullup 
Add options to invert RX and TX and to enable pullup on RX
 2023-11-13 17:02:31 +01:00
Proddy
196e98b3bd Merge pull request #1418 from proddy/dev 
show UOM in console when 'show values'. And added a new system command called 'values' which dumps the same to JSON
 2023-11-13 17:00:33 +01:00
Proddy
a0f1f51cca rename system values -> allvalues 2023-11-13 16:58:32 +01:00
Proddy
d717b72a9e have its own show_values function 2023-11-13 16:58:20 +01:00
Proddy
eccece7207 minor code optimization 2023-11-13 16:57:35 +01:00
Proddy
499ff0d31e include (HS1) for standalone testing 2023-11-13 16:57:20 +01:00
Proddy
ae0599d13d optionally render with UOM attached 2023-11-13 16:56:48 +01:00
Proddy
1a9cf4ebdc added more space for longer names 2023-11-13 16:56:25 +01:00
Proddy
386082b747 update for vscode 2023-11-13 16:55:52 +01:00
Proddy
fc02721815 package update 2023-11-13 16:55:10 +01:00
Pelle van der Heide
529970fb19 remove option for RX_PULLUP, this is enabled by default in esp-idf 2023-11-13 14:30:42 +01:00
MichaelDvP
752ce333ec RC300/BC400 mode setting 2023-11-13 14:04:55 +01:00
MichaelDvP
f34be2a884 test for fixing #1420 2023-11-13 13:59:30 +01:00
MichaelDvP
bed1650350 Merge branch 'dev2x' into dev2 2023-11-13 13:57:05 +01:00