Commit Graph
10897 Commits
Author SHA1 Message Date
Proddy 7212439f1b Merge pull request #3180 from MichaelDvP/dev
control entity only for master thermostat, #3173
2026-08-03 08:38:30 +02:00
MichaelDvP 6f7f343abd Merge remote-tracking branch 'mdvp/dev' into dev 2026-08-02 16:56:13 +02:00
MichaelDvP 42e6e31476 typo 2026-08-02 16:55:37 +02:00
MichaelDvP 96cf019f0a chore: update generated files for v3.9.0-dev.1 2026-08-02 14:49:34 +00:00
MichaelDvP 59b0417297 Merge branch 'core3' into dev 2026-08-02 16:32:05 +02:00
Proddy 2369277a9e Merge pull request #3179 from proddy/dev
fix lint warnings from SonarQube
2026-08-02 14:42:17 +02:00
proddy e166db8b70 fix lint warnings from SonarQube 2026-08-02 14:41:46 +02:00
proddy 36884867f7 fix for formidable loading, and svg being compressed 2026-08-02 14:40:32 +02:00
proddyandCursor 7fb8eb3592 Merge branch 'core3' into dev
Brings the ESP32 Arduino core 3 work (515 commits) into dev, moving the
version to 3.9.0-dev.0.

The 10 commits dev had since the merge base were auto-formatting, docs
regeneration and a version bump, all of which core3 had already applied
or superseded, so every conflict resolved to the core3 side and the
resulting tree matches core3 exactly.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-08-02 13:04:07 +02:00
proddy 2e988df817 preparing 3.9.0-dev.0 2026-08-02 12:53:04 +02:00
Proddy 483e124484 Merge pull request #3177 from proddy/core3
Core3 - pkg update and formatting
2026-08-01 17:05:51 +02:00
Proddy e0f59a4c31 Merge pull request #3176 from proddy/dev
pkg update and getting ready for stable
2026-08-01 17:05:18 +02:00
proddy 7eba8acbb4 3.8.3-dev.11 2026-08-01 17:04:13 +02:00
proddy 34db81ab4b package update 2026-08-01 17:03:31 +02:00
proddy e9a422bd27 add exit clause 2026-08-01 17:03:26 +02:00
proddy 4a8ad71b63 auto-formatting 2026-08-01 17:03:15 +02:00
proddy d0e6a603bb auto-formatting 2026-08-01 16:57:41 +02:00
proddy 36b4dd55a7 pkg update 2026-08-01 16:44:16 +02:00
proddy 341a4d4e1d update version 2026-08-01 16:44:11 +02:00
proddy a61745b710 formatting 2026-08-01 16:44:03 +02:00
proddy b1ebd81ca2 update 2026-08-01 16:43:55 +02:00
MichaelDvP 6487a3be70 remove device without entities and not registered by busmaster 2026-07-31 18:40:18 +02:00
MichaelDvP 2eb804de0b show control only for master thermostat #3173 2026-07-31 18:33:25 +02:00
Proddy 6801f7b8cf Merge pull request #3175 from proddy/core3
Core3 pkg updates
2026-07-31 09:51:00 +02:00
proddy c9b90e282f pkg updates 2026-07-31 09:49:15 +02:00
proddy 11eeb521d5 fix state class for uptime 2026-07-28 21:28:30 +02:00
Proddy 1ff53e6ac7 Merge pull request #3171 from MichaelDvP/dev
fix water SM100
2026-07-28 19:02:52 +02:00
Proddy 67c8b8429b Merge pull request #3172 from MichaelDvP/core3
Merged dev with water fix
2026-07-28 18:58:34 +02:00
MichaelDvP c624e82ada update modbus 2026-07-28 10:11:39 +02:00
MichaelDvP 722e4665af Merge branch 'dev' into core3 2026-07-28 10:03:35 +02:00
MichaelDvP ba7c9cdc1b Merge remote-tracking branch 'emsesp/core3' into core3 2026-07-28 09:57:11 +02:00
Proddy 8c647331f2 Merge pull request #3170 from proddy/core3
Core3 - CZflag
2026-07-27 18:17:40 +02:00
proddy 9a98f6b2ff revert CZflag 2026-07-27 18:14:45 +02:00
proddy 1631b607c5 pkg auto-update 2026-07-27 18:12:33 +02:00
MichaelDvP 4646572c80 dump 2026-07-27 09:11:17 +02:00
MichaelDvP 9b5f9e7a28 Merge remote-tracking branch 'emsesp/core3' into core3 2026-07-27 08:56:17 +02:00
Proddy 4575f62e36 Merge pull request #3169 from proddy/core3
port two espMqttClient fixes from upstream 1.7.3
2026-07-26 17:41:41 +02:00
proddy aa8481c42e migrate espMqttClient upsteam patches 2026-07-26 17:39:58 +02:00
Proddy 454b45ee65 Merge pull request #3168 from proddy/core3
Core3 - implement setting to disable factory reset
2026-07-26 13:45:55 +02:00
Proddy 500f9ef5c5 Merge branch 'emsesp:core3' into core3 2026-07-26 13:45:12 +02:00
proddy 96f2e6d5a7 update 2026-07-26 13:44:30 +02:00
proddy a469507fb6 add disable_reset 2026-07-26 13:42:50 +02:00
proddy 2bef33f81a added application setting 'disable factory' Feature request->Button anti tampering mode
Fixes #3150
2026-07-26 13:34:15 +02:00
proddy e584adaa07 ESP32Async/ESPAsyncWebServer @ 3.12.0 2026-07-26 13:32:13 +02:00
Proddy faa327cd08 Merge pull request #3167 from proddy/core3
Core3 updates
2026-07-26 11:26:33 +02:00
proddy ec4572c9fc update tests with API attribute changes 2026-07-26 11:23:21 +02:00
proddy 1398aac828 auto-build modbus and run tests 2026-07-26 11:22:48 +02:00
proddy a25f73f0ec cz -> cs 2026-07-26 11:22:30 +02:00
proddy 3d402b0c94 update auto-generated docs 2026-07-26 11:22:11 +02:00
proddy c91488d2fe cz -> cs 2026-07-26 11:16:10 +02:00