Merge branch 'dev' into jesserockz-2026-446

Address esphbot review: emitting min/max means named scalar schemas now carry
bounds (e.g. core.uint8_t is 0..255), and shrink()'s spread copied those over a
tighter bound the field defined itself. cv.All(cv.uint8_t, cv.Range(min=1,
max=6)) dumped 0..255 instead of 1..6, and All(uint32_t, Range(min=1)) lost its
min. The spread now reconciles the two to the intersection (larger min, smaller
max); non-numeric bounds keep the field's own value.

.github/actions/restore-python/action.yml

@@ -32,7 +32,7 @@ runs:
       # detects the activated venv via ``VIRTUAL_ENV`` so the venv layout
       # downstream jobs rely on is preserved.
       if: steps.cache-venv.outputs.cache-hit != 'true'
-      uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+      uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
       with:
         enable-cache: true
         # Pull request saves land in per-PR scopes nothing else can

.github/workflows/ci-api-proto.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Set up uv
         # ``--system`` (below) installs into the setup-python interpreter;
         # no venv is created or restored by this workflow.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull-request-only workflow: a save could never be shared and
@@ -97,7 +97,7 @@ jobs:
         run: git diff
       - if: failure()
         name: Archive artifacts
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: generated-proto-files
           path: |

.github/workflows/ci-docker.yml

@@ -128,7 +128,7 @@ jobs:
 
       - name: Upload compile-test image artifact
         if: matrix.os == 'ubuntu-24.04' && matrix.build_type == 'docker'
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           # The tar is already compressed, so upload it as-is. archive: false
           # skips the redundant zip and makes the file name the artifact name
@@ -210,7 +210,7 @@ jobs:
     steps:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Download image artifact
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: compile-test-image.tar.zst
       - name: Load image

.github/workflows/ci.yml

@@ -49,7 +49,7 @@ jobs:
         # detects the activated venv via ``VIRTUAL_ENV`` so downstream jobs
         # that ``. venv/bin/activate`` see an identical layout.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -81,8 +81,8 @@ jobs:
       - name: Install apt packages (cached)
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
 
   determine-jobs:
     name: Determine which jobs to run
@@ -415,8 +415,8 @@ jobs:
         timeout-minutes: 10
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
       - name: Set up Python 3.13
         id: python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
@@ -438,7 +438,7 @@ jobs:
       - name: Set up uv
         # Only needed on cache miss to populate the venv.
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -477,7 +477,7 @@ jobs:
         # Tests that compare rendered output write the image they actually got here, so a
         # failure can be looked at without reproducing the whole build locally.
         if: failure()
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: integration-test-artifacts-${{ matrix.bucket.name }}
           path: test_artifacts/
@@ -488,7 +488,7 @@ jobs:
         # script/update_integration_test_durations.py; only full matrix dev
         # runs produce usable data.
         if: github.ref == 'refs/heads/dev' && needs.determine-jobs.outputs.integration-run-all == 'true'
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: junit-integration-${{ strategy.job-index }}
           path: junit-integration.xml
@@ -528,7 +528,7 @@ jobs:
           script/check_import_time.py --check --har importtime.har
       - name: Upload waterfall HAR
         if: always()
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: import-time-waterfall
           path: importtime.har
@@ -626,7 +626,7 @@ jobs:
             apt-get install -y libc6-dbg
 
       - name: Run CodSpeed benchmarks
-        uses: CodSpeedHQ/action@f842b9a3ffe213dbb81768fd7f7eeb4dfcf1c369 # v5.4.2
+        uses: CodSpeedHQ/action@c4fd08a3a159bd0cc208da1e0edf32b8c47d75e5 # v5.4.0
         with:
           run: |
             . venv/bin/activate
@@ -680,7 +680,7 @@ jobs:
         include:
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
-            options: --environment esp8266-arduino-tidy --grep USE_ESP8266 --grep USE_SOCKET_IMPL_LWIP_TCP --grep USE_SHD_FIRMWARE_DATA
+            options: --environment esp8266-arduino-tidy --grep USE_ESP8266
             pio_cache_key: tidyesp8266
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 Arduino
@@ -693,16 +693,12 @@ jobs:
             ignore_errors: false
           - id: clang-tidy
             name: Run script/clang-tidy for RP2
-            options: --environment rp2-tidy --grep USE_RP2 --grep USE_BLE_SCAN_RESPONSE_MERGER
+            options: --environment rp2-tidy --grep USE_RP2
             pio_cache_key: tidyrp2
-          - id: clang-tidy
-            name: Run script/clang-tidy for host
-            options: --environment host-tidy --grep USE_HOST
-            pio_cache_key: tidyhost
           - id: clang-tidy
             name: Run script/clang-tidy for LibreTiny
             environments: bk72xx-tidy ln882h-tidy rtl87xxb-tidy rtl87xxc-tidy
-            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X --grep USE_LN882H_BLE --grep USE_SOCKET_IMPL_LWIP_SOCKETS
+            options: --grep USE_LIBRETINY --grep USE_BK72XX --grep USE_RTL87XX --grep USE_LN882X
             pio_cache_key: tidylibretiny
 
     steps:
@@ -711,16 +707,6 @@ jobs:
         with:
           # Need history for HEAD~1 to work for checking changed files
           fetch-depth: 2
-      - name: Install apt packages (cached)
-        if: matrix.pio_cache_key == 'tidyhost'
-        # libsdl2-dev is needed by the sdl component on the host, libmbedtls-dev
-        # by dsmr and dlms_meter. Packages and version must match seed-apt-cache
-        # exactly.
-        timeout-minutes: 10
-        uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
-        with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
 
       - name: Restore Python
         id: restore-python
@@ -1003,14 +989,14 @@ jobs:
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 S3
             # yamllint disable-line rule:line-length
-            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC --grep SOC_I2S_SUPPORTS_TDM
+            options: --environment esp32s3-idf-tidy --grep SOC_TEMP_SENSOR_SUPPORTED --grep USE_ESP32_VARIANT_ESP32S3 --grep USE_LOGGER_USB_CDC
             tidy_environment: esp32s3-idf-tidy
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 P4
             # P4 has no native Wi-Fi/BLE; those run over the hosted co-processor,
             # so their code paths differ -- lint them under the P4 build too.
             # yamllint disable-line rule:line-length
-            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep CONFIG_IDF_TARGET_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
+            options: --environment esp32p4-idf-tidy --grep USE_ESP32_VARIANT_ESP32P4 --grep USE_ESP32_HOSTED --grep USE_WIFI --grep USE_BLE
             tidy_environment: esp32p4-idf-tidy
           - id: clang-tidy
             name: Run script/clang-tidy for ESP32 C6
@@ -1116,8 +1102,8 @@ jobs:
         timeout-minutes: 10
         uses: awalsh128/cache-apt-pkgs-action@553a35bb8ebd9fcabcb1c9451aa4c98e1b4ca8a9 # v1.6.3
         with:
-          packages: libsdl2-dev libmbedtls-dev ccache
-          version: 1.2
+          packages: libsdl2-dev ccache
+          version: 1.1
 
       - name: Check out code from GitHub
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
@@ -1462,7 +1448,7 @@ jobs:
         # install step (order-of-magnitude faster on cold boots,
         # with its own wheel cache). actions/setup-python still
         # provides the interpreter.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pull request saves land in per-PR scopes nothing else can
@@ -1661,7 +1647,7 @@ jobs:
           fi
 
       - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: memory-analysis-target
           path: memory-analysis-target.json
@@ -1724,7 +1710,7 @@ jobs:
             --platform "$platform"
 
       - name: Upload memory analysis JSON
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: memory-analysis-pr
           path: memory-analysis-pr.json
@@ -1754,13 +1740,13 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
           cache-key: ${{ needs.common.outputs.cache-key }}
       - name: Download target analysis JSON
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: memory-analysis-target
           path: ./memory-analysis
         continue-on-error: true
       - name: Download PR analysis JSON
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: memory-analysis-pr
           path: ./memory-analysis

.github/workflows/codeql.yml

@@ -56,7 +56,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           languages: ${{ matrix.language }}
           build-mode: ${{ matrix.build-mode }}
@@ -84,6 +84,6 @@ jobs:
           exit 1
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
+        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
         with:
           category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -162,7 +162,7 @@ jobs:
       #     version: ${{ needs.init.outputs.tag }}
 
       - name: Upload digests
-        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: digests-${{ matrix.platform.arch }}
           path: /tmp/digests
@@ -195,7 +195,7 @@ jobs:
       - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: Download digests
-        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           pattern: digests-*
           path: /tmp/digests

.github/workflows/sync-device-classes.yml

@@ -47,7 +47,7 @@ jobs:
         # setup-python interpreter so subsequent ``prek`` /
         # ``script/run-in-env.py`` steps find the deps without a
         # ``uv run`` prefix.
-        uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
+        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
         with:
           enable-cache: true
           # Pin uv version so the action does not have to fetch the

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ ci:
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     # Ruff version.
-    rev: v0.17.0
+    rev: v0.16.10
     hooks:
       # Run the linter.
       - id: ruff
@@ -36,7 +36,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.22.0
+    rev: v3.21.2
     hooks:
       - id: pyupgrade
         args: [--py312-plus]

AGENTS.md

@@ -144,9 +144,6 @@ file does, and it is the authority when they disagree. The most useful starting
 
 *   **C++ Preprocessor Directives:**
     *   **Avoid `#define` for constants:** Using `#define` for constants is discouraged and should be replaced with `const` variables or enums.
-    *   **A constant with a compile-time initializer is `static constexpr`,** not `static const`, at namespace scope
-        and inside functions; `static const` is only for a value computed at run time. A function-local
-        `static constexpr` table is a static constant to clang-tidy, so it is `UPPER_SNAKE_CASE` too.
     *   **Use `#define` only for:**
         - Conditional compilation (`#ifdef`, `#ifndef`)
         - Compile-time sizes calculated during Python code generation (e.g., configuring `std::array` or `StaticVector` dimensions via `cg.add_define()`)
@@ -220,9 +217,6 @@ file does, and it is the authority when they disagree. The most useful starting
         listener base (a second vptr per entity).
     *   **A global feature define** says the code is compiled in, not that this instance uses it: keep the
         per-instance check (`if (this->aux_device_ == ...)`) inside the `#ifdef`.
-    *   **Model-specific code** sits behind a define the Python side emits only for configs that use that model
-        (`cg.add_define("USE_SELEC_METER_EM4M")`), so the other models' builds leave it out; the runtime model check
-        stays inside the `#ifdef`.
     *   **Failures after `setup()`:** `mark_failed()` is for `setup()` only. A runtime read or write failure
         sets `status_set_warning()` and the next success clears it; writes skip work when `is_failed()`.
     *   **Fixed platform facts compile to nothing:** gate on `#ifdef USE_ESP8266` and friends, not on a
@@ -573,9 +567,6 @@ file does, and it is the authority when they disagree. The most useful starting
     An intentionally empty body (an unused `register_dumper` builder, for example) gets a one-line docstring, not `pass`.
 
 *   **Configuration Validation:**
-    *   **One schema per model:** when a component's options depend on a `model` key, use `cv.typed_schema({...},
-        key=CONF_MODEL, default_type=...)` with each model's own keys and defaults, not one schema plus a validator
-        that rejects keys and fills defaults afterwards.
     *   **Reuse existing validators:** Before writing a custom validator, check for an existing one in `config_validation.py` and compose it in `cv.All(...)` rather than duplicating logic across components. For example, rename a config key with `cv.rename_key(CONF_OLD, CONF_NEW, removed_in="2026.6.0")`, and reject mutually-exclusive keys with `cv.has_at_most_one_key(...)` / `cv.has_exactly_one_key(...)`. See how `api` composes `cv.has_exactly_one_key` + `cv.rename_key`.
     *   **Common Validators:** `cv.int_`, `cv.float_`, `cv.string`, `cv.boolean`, `cv.int_range(min=0, max=100)`, `cv.positive_int`, `cv.percentage`.
     *   **Complex Validation:** `cv.All(cv.string, cv.Length(min=1, max=50))`, `cv.Any(cv.int_, cv.string)`.
@@ -618,9 +609,6 @@ file does, and it is the authority when they disagree. The most useful starting
         `on_tx` lambda with a static counter and `inject_to_rx_buffer` (see `uart_mock_ld2412_requery_after_giveup.yaml`).
     *   **Keep build-test variants few:** one `test.<platform>.yaml` per platform the code actually differs
         on. A variant per board for platform-identical code only adds CI time.
-    *   **A test that needs a shared component in a particular state** (`esp32_ble` security settings, an option
-        that PSRAM rejects) cannot be grouped: the merged block wins and the whole batch fails. Add the component to
-        `ISOLATED_COMPONENTS` in `script/analyze_component_buses.py`, or move the option to a `test-<variant>` file.
     *   **Component Tests:** YAML-based compilation tests are located in `tests/`. The structure is as follows:
         ```
         tests/

CODEOWNERS

@@ -106,7 +106,6 @@ esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/bq25186/* @Rapsssito
 esphome/components/bq27220/* @rggammon
-esphome/components/bq76972/* @limpkin
 esphome/components/bridge/* @kbx81
 esphome/components/bthome_mithermometer/* @nagyrobi
 esphome/components/button/* @esphome/core
@@ -212,14 +211,11 @@ esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
 esphome/components/file/* @esphome/core
-esphome/components/filter_lifetime/* @tuct
 esphome/components/fingerprint_grow/* @alexborro @loongyh @OnFreund
 esphome/components/font/* @clydebarrow @esphome/core
-esphome/components/friedrich/* @rwrozelle
 esphome/components/fs3000/* @kahrendt
 esphome/components/ft5x06/* @clydebarrow
 esphome/components/ft63x6/* @gpambrozio
-esphome/components/fusb302b/* @remcom
 esphome/components/gcja5/* @gcormier
 esphome/components/gdk101/* @Szewcson
 esphome/components/gl_r01_i2c/* @pkejval
@@ -241,13 +237,9 @@ esphome/components/gt911/* @clydebarrow @jesserockz
 esphome/components/haier/* @paveldn
 esphome/components/haier/binary_sensor/* @paveldn
 esphome/components/haier/button/* @paveldn
-esphome/components/haier/select/* @paveldn
 esphome/components/haier/sensor/* @paveldn
 esphome/components/haier/switch/* @paveldn
 esphome/components/haier/text_sensor/* @paveldn
-esphome/components/haier_tundra/* @fauxpark
-esphome/components/haier_tundra/button/* @fauxpark
-esphome/components/haier_tundra/switch/* @fauxpark
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
@@ -292,7 +284,6 @@ esphome/components/i2s_audio/microphone/* @jesserockz
 esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
 esphome/components/i2s_clockless_led_strip/* @j9brown
 esphome/components/iaqcore/* @yozik04
-esphome/components/icm20689/* @lboue
 esphome/components/icnt86/* @danepowell
 esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
@@ -387,7 +378,6 @@ esphome/components/microphone/* @jesserockz @kahrendt
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
-esphome/components/midea_portasplit/* @Fexiven
 esphome/components/mipi_dsi/* @clydebarrow
 esphome/components/mipi_rgb/* @clydebarrow
 esphome/components/mipi_spi/* @clydebarrow
@@ -442,7 +432,6 @@ esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/packet_transport/* @clydebarrow
 esphome/components/pca6416a/* @Mat931
-esphome/components/pca9505/* @ajfriesen @ssieb
 esphome/components/pca9554/* @bdraco @clydebarrow @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman

esphome/__main__.py

@@ -483,9 +483,12 @@ def has_ota() -> bool:
 
 def has_native_ota() -> bool:
     """Check if native API OTA upload is available (``platform: esphome``)."""
-    from esphome.espota2 import esphome_ota_items
-
-    return bool(esphome_ota_items(CORE.config))
+    if CONF_OTA not in CORE.config:
+        return False
+    return any(
+        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
+        for ota_item in CORE.config[CONF_OTA]
+    )
 
 
 def has_web_server_ota() -> bool:
@@ -1356,17 +1359,14 @@ def _choose_ota_platform(config: ConfigType, requested: str | None) -> str:
     return CONF_WEB_SERVER
 
 
-def _esphome_ota_conf(config: ConfigType) -> ConfigType | None:
-    """The validated esphome OTA platform block, if configured."""
-    from esphome.espota2 import esphome_ota_items
-
-    return next(iter(esphome_ota_items(config)), None)
-
-
 def _upload_via_native_api(
     config: ConfigType, network_devices: list[str], args: ArgsProtocol
 ) -> tuple[int, str | None]:
-    ota_conf = _esphome_ota_conf(config) or {}
+    ota_conf: ConfigType = {}
+    for ota_item in config.get(CONF_OTA, []):
+        if ota_item.get(CONF_PLATFORM) == CONF_ESPHOME:
+            ota_conf = ota_item
+            break
 
     from esphome import espota2
     from esphome.components.noise import static_encryption_key
@@ -1457,8 +1457,10 @@ def _old_key_notice(config: ConfigType) -> None:
     `upload` may send a stale image that still carries the previous key."""
     from esphome import espota2
 
-    for item in espota2.esphome_ota_items(config):
-        if (item.get(CONF_ENCRYPTION) or {}).get(espota2.CONF_OLD_KEY):
+    for item in config.get(CONF_OTA, []):
+        if item.get(CONF_PLATFORM) == CONF_ESPHOME and (
+            item.get(CONF_ENCRYPTION) or {}
+        ).get(espota2.CONF_OLD_KEY):
             _LOGGER.warning(espota2.OLD_KEY_REMOVE_NOTICE)
 
 
@@ -1466,12 +1468,12 @@ def _upload_via_web_server(
     config: ConfigType, network_devices: list[str], binary: Path
 ) -> tuple[int, str | None]:
     from esphome import web_server_ota
-    from esphome.espota2 import esphome_ota_items
     from esphome.web_server_helpers import get_web_server_connection
 
     if any(
-        ota_item.get(CONF_ENCRYPTION) is not None
-        for ota_item in esphome_ota_items(config)
+        ota_item.get(CONF_PLATFORM) == CONF_ESPHOME
+        and ota_item.get(CONF_ENCRYPTION) is not None
+        for ota_item in config.get(CONF_OTA, [])
     ):
         _LOGGER.warning(
             "This config has OTA encryption, but the web_server OTA path sends "

esphome/automation.py

@@ -248,23 +248,6 @@ def flash_string(config: ConfigType, value: str) -> str:
     return str(cg.progmem_string(value))
 
 
-def flash_compare(config: ConfigType, value: str) -> str:
-    """Default renderer for ``std::string`` constants in conditions; compares in flash on ESP8266."""
-    if CORE.is_esp8266:
-        return f"::esphome::ProgmemStringRef{{PSTR({cg.safe_exp(value)}), {len(value.encode('utf-8'))}}}"
-    return str(cg.safe_exp(value))
-
-
-def _default_std_string(
-    members: list[tuple[str, Any, Any]], renderer: Callable[[ConfigType, str], str]
-) -> list[tuple[str, Any, Any]]:
-    """Give ``cg.std_string`` members without a renderer the given default."""
-    return [
-        (key, t, fn or (renderer if t is cg.std_string else None))
-        for key, t, fn in members
-    ]
-
-
 def literal_with_length(config: ConfigType, value: str) -> str:
     """Renderer for a ``(const char *, size_t)`` target: a plain literal plus its byte length.
 
@@ -508,7 +491,10 @@ def apply_action_builder(
     statements_spec = [
         (
             c.target,
-            _default_std_string(c.members, flash_string),
+            [
+                (key, t, fn or (flash_string if t is cg.std_string else None))
+                for key, t, fn in c.members
+            ],
         )
         for c in (f if isinstance(f, ApplyCall) else f.call() for f in fields)
     ]
@@ -577,12 +563,11 @@ def register_apply_condition(
     ``check`` is applied to the parent: ``"is_playing()"`` becomes ``parent->is_playing()``; an
     ``ApplyCall`` such as ``ApplyCall("state == {}", ((CONF_STATE, cg.bool_),))`` compares
     against config values, all of which must be present. Write ``== false`` to negate.
-    A ``cg.std_string`` constant stays in flash on ESP8266 and supports only ``==`` or ``!=``
-    against a ``std::string`` or ``StringRef`` member; other string types are plain literals.
+    String constants are plain literals, so compare a ``std::string`` or ``StringRef`` member.
     Generates one static predicate and an ``ApplyCondition`` templated on it.
     """
     call = check if isinstance(check, ApplyCall) else ApplyCall(check)
-    members = _default_std_string(call.members, flash_compare)
+    members = call.members
     _check_key_in_schema(name, schema, id_key)
     for conf_key, _, _ in members:
         _check_key_in_schema(name, schema, conf_key)
@@ -906,21 +891,6 @@ async def while_action_to_code(
     return var
 
 
-def _shadow_iteration(args: TemplateArgsType) -> TemplateArgsType:
-    """Rename an inherited `iteration` so the inner repeat's own counter can shadow it."""
-    names = {name for _, name in args}
-    renamed: TemplateArgsType = []
-    for type_, name in args:
-        if name == "iteration":
-            depth = 1
-            while f"iteration_{depth}" in names:
-                depth += 1
-            name = f"iteration_{depth}"
-            names.add(name)
-        renamed.append((type_, name))
-    return renamed
-
-
 @register_action(
     "repeat",
     RepeatAction,
@@ -944,7 +914,7 @@ async def repeat_action_to_code(
     actions = await build_action_list(
         config[CONF_THEN],
         cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *_shadow_iteration(args)],
+        [(cg.uint32, "iteration"), *args],
     )
     for action in actions:
         cg.add(var.add_then_action(action))

esphome/code_scan.py

@@ -1,126 +0,0 @@
-"""Build-time scans of the user's C++ sources: lambdas, ``includes:`` files and
-external components.
-
-The only scan today finds scanf calls with float conversions, which decides
-whether float scanf support (or, on ESP-IDF Bluetooth builds, the libc sscanf)
-must stay linked. Other source heuristics belong here too.
-"""
-
-import logging
-from pathlib import Path
-import re
-
-from esphome.config_helpers import iter_include_files
-from esphome.const import (
-    CONF_ESPHOME,
-    CONF_INCLUDES,
-    CONF_INCLUDES_C,
-    SOURCE_FILE_EXTENSIONS,
-)
-from esphome.core import Lambda
-from esphome.types import ConfigType
-
-_LOGGER = logging.getLogger(__name__)
-
-# The string literal handed to a scanf family call as its format: an optional
-# first argument (sscanf/fscanf; a literal or a call with its own commas is
-# fine) then the literal.
-_SCANF_FORMAT_RE = re.compile(
-    r'scanf\s*\((?:(?:"(?:[^"\\]|\\.)*"|\([^()]*\)|[^,;"()])*,)?\s*"((?:[^"\\]|\\.)*)"'
-)
-# Standard scanf float conversions %f %F %e %E %g %G %a %A with optional
-# suppression, width and length; also the invalid %.2f users write by analogy
-# with printf.
-_SCANF_FLOAT_SPEC_RE = re.compile(r"%[*\d.]*[hlL]*[feEgGaAF]")
-
-
-def source_uses_scanf_float(src: str) -> bool:
-    """Heuristic: does C++ source call a scanf family function with a float conversion?"""
-    if "scanf" not in src:
-        return False
-    src = Lambda.comment_remover(src)
-    return any(
-        _SCANF_FLOAT_SPEC_RE.search(match.group(1))
-        for match in _SCANF_FORMAT_RE.finditer(src)
-    )
-
-
-def lambdas_use_scanf_float(config: ConfigType) -> bool:
-    """Check if any lambda in the config uses scanf with a float format specifier."""
-    stack: list = [config]
-    while stack:
-        obj = stack.pop()
-        if isinstance(obj, Lambda):
-            if source_uses_scanf_float(obj.value):
-                return True
-        elif isinstance(obj, dict):
-            stack.extend(obj.values())
-        elif isinstance(obj, list):
-            stack.extend(obj)
-    return False
-
-
-def includes_use_scanf_float(config: ConfigType) -> bool:
-    """Check if an ``includes:`` or ``includes_c:`` file uses scanf with a float format specifier."""
-    esphome_config = config.get(CONF_ESPHOME, {})
-    includes = esphome_config.get(CONF_INCLUDES, []) + esphome_config.get(
-        CONF_INCLUDES_C, []
-    )
-    for path, _ in iter_include_files(includes):
-        if path.suffix not in SOURCE_FILE_EXTENSIONS:
-            continue
-        if source_uses_scanf_float(path.read_text(encoding="utf-8", errors="replace")):
-            return True
-    return False
-
-
-def external_components_use_scanf_float(config: ConfigType) -> bool:
-    """Whether a component from outside the esphome package scans a float."""
-    from esphome.config import iter_components
-    from esphome.loader import CORE_COMPONENTS_PATH
-
-    package_root = CORE_COMPONENTS_PATH.parent
-    for _, component in iter_components(config):
-        package_dir = Path(component.module.__file__).resolve().parent
-        if package_dir.is_relative_to(package_root):
-            continue
-        for resource in component.resources:
-            src = (package_dir / resource.resource).read_text(
-                encoding="utf-8", errors="replace"
-            )
-            if source_uses_scanf_float(src):
-                return True
-    return False
-
-
-def user_code_uses_scanf_float(config: ConfigType) -> bool:
-    """Whether a lambda, an ``includes:`` file or an external component scans a float."""
-    return (
-        lambdas_use_scanf_float(config)
-        or includes_use_scanf_float(config)
-        or external_components_use_scanf_float(config)
-    )
-
-
-def keep_float_scanf(
-    option: bool | None, config: ConfigType, flash_note: str, override_note: str
-) -> bool:
-    """Resolve a tri-state float-scanf option: unset means "only if user code scans a float"."""
-    if option:
-        return True
-    found = user_code_uses_scanf_float(config)
-    if option is None:
-        if found:
-            _LOGGER.warning(
-                "Lambda, include or external component uses scanf with a float format "
-                "specifier; keeping float scanf support (%s)",
-                flash_note,
-            )
-        return found
-    if found:
-        _LOGGER.warning(
-            "Float scanf support is disabled but a lambda, include or external "
-            "component uses scanf with a float format specifier; %s",
-            override_note,
-        )
-    return False

esphome/components/audio/__init__.py

@@ -338,7 +338,7 @@ async def to_code(config: ConfigType) -> None:
     # HTTPS streams verify the server against the root certificate bundle
     require_certificate_bundle()
 
-    add_idf_component(name="esphome/esp-audio-libs", ref="4.1.0")
+    add_idf_component(name="esphome/esp-audio-libs", ref="4.0.1")
 
     data = _get_data()
 

esphome/components/bedjet/bedjet_const.h

@@ -1,11 +1,10 @@
 #pragma once
 
 #include <set>
-#include "esphome/core/log.h"
 
 namespace esphome::bedjet {
 
-ESPHOME_LOG_TAG(TAG, "bedjet");
+static const char *const TAG = "bedjet";
 
 /// Converts a BedJet fan step to a speed percentage, in the range of 5% to 100%.
 inline static uint8_t bedjet_fan_step_to_speed(const uint8_t fan) {

esphome/components/ble_client/automation.cpp

@@ -4,7 +4,7 @@
 
 namespace esphome::ble_client {
 
-const char *const Automation::TAG = "ble_client.automation";  // NOLINT: ble_client never builds for ESP8266
+const char *const Automation::TAG = "ble_client.automation";
 
 }  // namespace esphome::ble_client
 

esphome/components/bm8563/bm8563.cpp

@@ -100,8 +100,7 @@ void BM8563::get_date_(ESPTime &time) {
   this->read_register(DATE_FIRST_REG, buf, sizeof(buf));
 
   time.day_of_month = this->bcd2_to_byte_(buf[0] & 0x3f);
-  // The chip counts weekdays 0-6 from Sunday (not BCD), ESPTime counts 1-7
-  time.day_of_week = (buf[1] & 0x07) + 1;
+  time.day_of_week = this->bcd2_to_byte_(buf[1] & 0x07);
   time.month = this->bcd2_to_byte_(buf[2] & 0x1f);
 
   uint8_t year_byte = this->bcd2_to_byte_(buf[3] & 0xff);
@@ -116,7 +115,7 @@ void BM8563::get_date_(ESPTime &time) {
 void BM8563::set_date_(const ESPTime &time) {
   uint8_t buf[4] = {
       this->byte_to_bcd2_(time.day_of_month),
-      static_cast<uint8_t>(time.day_of_week - 1),
+      this->byte_to_bcd2_(time.day_of_week),
       this->byte_to_bcd2_(time.month),
       this->byte_to_bcd2_(time.year % 100),
   };

esphome/components/bme280_i2c/bme280_i2c.h

@@ -2,11 +2,10 @@
 
 #include "esphome/components/bme280_base/bme280_base.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/core/log.h"
 
 namespace esphome::bme280_i2c {
 
-ESPHOME_LOG_TAG(TAG, "bme280_i2c.sensor");
+static const char *const TAG = "bme280_i2c.sensor";
 
 class BME280I2CComponent final : public esphome::bme280_base::BME280Component, public i2c::I2CDevice {
   bool read_byte(uint8_t a_register, uint8_t *data) override;

esphome/components/bmp280_i2c/bmp280_i2c.h

@@ -2,11 +2,10 @@
 
 #include "esphome/components/bmp280_base/bmp280_base.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/core/log.h"
 
 namespace esphome::bmp280_i2c {
 
-ESPHOME_LOG_TAG(TAG, "bmp280_i2c.sensor");
+static const char *const TAG = "bmp280_i2c.sensor";
 
 /// This class implements support for the BMP280 Temperature+Pressure i2c sensor.
 class BMP280I2CComponent final : public esphome::bmp280_base::BMP280Component, public i2c::I2CDevice {

esphome/components/bmp581_i2c/bmp581_i2c.h

@@ -2,11 +2,10 @@
 
 #include "esphome/components/bmp581_base/bmp581_base.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/core/log.h"
 
 namespace esphome::bmp581_i2c {
 
-ESPHOME_LOG_TAG(TAG, "bmp581_i2c.sensor");
+static const char *const TAG = "bmp581_i2c.sensor";
 
 /// This class implements support for the BMP581 Temperature+Pressure i2c sensor.
 class BMP581I2CComponent final : public esphome::bmp581_base::BMP581Component, public i2c::I2CDevice {

esphome/components/bq25186/__init__.py

@@ -5,8 +5,8 @@ from esphome import automation
 import esphome.codegen as cg
 from esphome.components import i2c
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_UPDATE_INTERVAL, CONF_WATCHDOG
-from esphome.core import CORE, ID, EsphomeError, Lambda, TimePeriod
+from esphome.const import CONF_ID
+from esphome.core import CORE, ID, Lambda
 from esphome.types import ConfigType, TemplateArgsType
 
 CODEOWNERS = ["@Rapsssito"]
@@ -14,7 +14,6 @@ DEPENDENCIES = ["i2c"]
 DOMAIN = "bq25186"
 MULTI_CONF = True
 
-CONF_BQ25186_ID = "bq25186_id"
 CONF_CONFIGURE_ON_BOOT = "configure_on_boot"
 CONF_BATTERY_REGULATION_VOLTAGE = "battery_regulation_voltage"
 CONF_FAST_CHARGE_CURRENT = "fast_charge_current"
@@ -44,7 +43,6 @@ CONF_WAKE2_TIMER = "wake2_timer"
 CONF_ENABLE_PUSH_BUTTON = "enable_push_button"
 CONF_SYSTEM_REGULATION = "system_regulation"
 CONF_SYS_MODE = "sys_mode"
-CONF_WATCHDOG_15S_ENABLE = "watchdog_15s_enable"
 CONF_DISABLE_VDPPM = "disable_vdppm"
 CONF_TS_HOT = "ts_hot"
 CONF_TS_COLD = "ts_cold"
@@ -58,26 +56,7 @@ CONF_MASK_BAT_INTERRUPT = "mask_bat_interrupt"
 CONF_MASK_PG_INTERRUPT = "mask_pg_interrupt"
 
 bq25186_ns = cg.esphome_ns.namespace("bq25186")
-BQ25186Component = bq25186_ns.class_(
-    "BQ25186Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-BQ25186_CHILD_SCHEMA = cv.Schema(
-    {cv.GenerateID(CONF_BQ25186_ID): cv.use_id(BQ25186Component)}
-)
-_request_binary_sensor_slot = cg.slot_counter("BQ25186_BINARY_SENSOR_COUNT")
-_request_text_sensor_slot = cg.slot_counter("BQ25186_TEXT_SENSOR_COUNT")
-
-
-def register_binary_sensor(hub: cg.MockObj, var: cg.MockObj) -> cg.Expression:
-    _request_binary_sensor_slot(str(hub))
-    return hub.register_binary_sensor(var)
-
-
-def register_text_sensor(hub: cg.MockObj, var: cg.MockObj) -> cg.Expression:
-    _request_text_sensor_slot(str(hub))
-    return hub.register_text_sensor(var)
-
+BQ25186Component = bq25186_ns.class_("BQ25186Component", cg.Component, i2c.I2CDevice)
 
 REG_VBAT_CTRL = 0x03
 REG_ICHG_CTRL = 0x04
@@ -90,6 +69,7 @@ REG_SYS_REG = 0x0A
 REG_TS_CONTROL = 0x0B
 REG_MASK_ID = 0x0C
 REGISTER_COUNT = REG_MASK_ID - REG_VBAT_CTRL + 1
+WATCHDOG_DISABLED = 0x03
 
 TERMINATION_PERCENT_OPTIONS = {"disabled": 0, "5%": 1, "10%": 2, "20%": 3}
 VINDPM_MODE_OPTIONS = {"battery_tracking": 0, "4.5v": 1, "4.7v": 2, "disabled": 3}
@@ -106,22 +86,6 @@ BATTERY_UVLO_OPTIONS = {
 VLOWV_OPTIONS = {"3.0v": 0, "2.8v": 1}
 RECHARGE_THRESHOLD_OPTIONS = {"100mv": 0, "200mv": 1}
 SAFETY_TIMER_OPTIONS = {"3h": 0, "6h": 1, "12h": 2, "disabled": 3}
-# The I2C watchdog restores the power-on registers when the bus stays quiet for its period
-WATCHDOG_OPTIONS = {
-    "160s_software_reset": 0,
-    "160s_hardware_reset": 1,
-    "40s_hardware_reset": 2,
-    "disabled": 3,
-}
-WATCHDOG_PERIOD_S = {
-    "160s_software_reset": 160,
-    "160s_hardware_reset": 160,
-    "40s_hardware_reset": 40,
-}
-# SYS_REG watchdog_15s_enable: a hardware reset when the bus stays quiet for 15 s after VIN connects
-WATCHDOG_15S_PERIOD_S = 15
-# The chip boots with the 160 s software reset watchdog, which runs until the configuration is applied
-POWER_ON_WATCHDOG_PERIOD_S = 160
 LONG_PRESS_DURATION_OPTIONS = {"5s": 0, "10s": 1, "15s": 2, "20s": 3}
 AUTOWAKE_OPTIONS = {"0.5s": 0, "1s": 1, "2s": 2, "4s": 3}
 INPUT_CURRENT_LIMIT_OPTIONS = {
@@ -182,8 +146,8 @@ def _on_current_step(amps: float) -> float:
 
 
 # (config key, register, bit shift, validator or enum options, default).
-# VBAT_CTRL bit 7 (pg_mode) and SYS_REG bit 4 (pg_gpo_level) stay 0; the PG/GPO
-# switch drives them.
+# VBAT_CTRL bit 7 (pg_mode) and SYS_REG bit 4 (pg_gpo_level) stay 0; they are
+# driven at runtime, not from configuration.
 FIELDS: tuple[tuple[str, int, int, Any, Any], ...] = (
     (
         CONF_BATTERY_REGULATION_VOLTAGE,
@@ -215,7 +179,6 @@ FIELDS: tuple[tuple[str, int, int, Any, Any], ...] = (
     (CONF_RECHARGE_THRESHOLD, REG_IC_CTRL, 5, RECHARGE_THRESHOLD_OPTIONS, "100mv"),
     (CONF_DOUBLE_TIMER_DURING_DPM, REG_IC_CTRL, 4, cv.boolean, False),
     (CONF_SAFETY_TIMER, REG_IC_CTRL, 2, SAFETY_TIMER_OPTIONS, "6h"),
-    (CONF_WATCHDOG, REG_IC_CTRL, 0, WATCHDOG_OPTIONS, "disabled"),
     (CONF_LONG_PRESS_DURATION, REG_TMR_ILIM, 6, LONG_PRESS_DURATION_OPTIONS, "10s"),
     (CONF_HW_RESET_REQUIRES_VIN, REG_TMR_ILIM, 5, cv.boolean, False),
     (CONF_AUTOWAKE, REG_TMR_ILIM, 3, AUTOWAKE_OPTIONS, "1s"),
@@ -232,7 +195,6 @@ FIELDS: tuple[tuple[str, int, int, Any, Any], ...] = (
     (CONF_ENABLE_PUSH_BUTTON, REG_SHIP_RST, 0, cv.boolean, True),
     (CONF_SYSTEM_REGULATION, REG_SYS_REG, 5, SYSTEM_REGULATION_OPTIONS, "4.5v"),
     (CONF_SYS_MODE, REG_SYS_REG, 2, SYS_MODE_OPTIONS, "normal"),
-    (CONF_WATCHDOG_15S_ENABLE, REG_SYS_REG, 1, cv.boolean, False),
     (CONF_DISABLE_VDPPM, REG_SYS_REG, 0, cv.boolean, False),
     (CONF_TS_HOT, REG_TS_CONTROL, 6, TS_HOT_OPTIONS, "60c"),
     (CONF_TS_COLD, REG_TS_CONTROL, 4, TS_COLD_OPTIONS, "0c"),
@@ -270,6 +232,9 @@ _ENCODERS: dict[str, Callable[[Any], int]] = {
 def pack_registers(config: ConfigType) -> list[int]:
     """Pack the validated field values into the VBAT_CTRL..MASK_ID register bytes."""
     regs = [0] * REGISTER_COUNT
+    # Watchdog disabled (IC_CTRL[1:0] = 3): nothing talks to the chip after boot yet, and a running
+    # watchdog restores the power-on defaults after 160 s. Part 2 adds the option with the polling.
+    regs[REG_IC_CTRL - REG_VBAT_CTRL] = WATCHDOG_DISABLED
     for key, register, shift, validator, _ in FIELDS:
         value = config[key]
         if isinstance(validator, dict):
@@ -294,28 +259,7 @@ def _field_schema(with_defaults: bool) -> cv.Schema:
 
 BQ25186_CONFIG_SCHEMA = _field_schema(with_defaults=True)
 
-
-def _check_watchdog(config: ConfigType) -> ConfigType:
-    """Only the status poll talks to the chip, so it has to come round before any watchdog does."""
-    periods = []
-    if (period := WATCHDOG_PERIOD_S.get(config[CONF_WATCHDOG])) is not None:
-        periods.append(period)
-    if config[CONF_WATCHDOG_15S_ENABLE]:
-        periods.append(WATCHDOG_15S_PERIOD_S)
-    if not config.get(CONF_CONFIGURE_ON_BOOT, True):
-        periods.append(POWER_ON_WATCHDOG_PERIOD_S)
-    if not periods:
-        return config
-    if config[CONF_UPDATE_INTERVAL] >= TimePeriod(seconds=(limit := min(periods))):
-        raise cv.Invalid(
-            f"{CONF_UPDATE_INTERVAL} must be shorter than {limit} s, or the "
-            f"watchdog resets the charger between status polls",
-            path=[CONF_UPDATE_INTERVAL],
-        )
-    return config
-
-
-CONFIG_SCHEMA = cv.All(
+CONFIG_SCHEMA = (
     cv.Schema(
         {
             cv.GenerateID(): cv.declare_id(BQ25186Component),
@@ -323,9 +267,7 @@ CONFIG_SCHEMA = cv.All(
         }
     )
     .extend(BQ25186_CONFIG_SCHEMA)
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x6A)),
-    _check_watchdog,
+    .extend(i2c.i2c_device_schema(0x6A))
 )
 
 CONFIGURE_ACTION_SCHEMA = automation.maybe_simple_id(
@@ -363,12 +305,7 @@ async def bq25186_configure_to_code(
     # Options the action leaves out fall back to the component's configuration
     path = CORE.config.get_path_for_id(config[CONF_ID])[:-1]
     parent_config = CORE.config.get_config_for_path(path)
-    merged = {**parent_config, **config}
-    try:
-        _check_watchdog(merged)
-    except cv.Invalid as err:
-        raise EsphomeError(f"bq25186.apply_configuration: {err.msg}") from err
-    regs = pack_registers(merged)
+    regs = pack_registers({**parent_config, **config})
 
     text = str(cg.statement(parent.apply_config(cg.ArrayInitializer(*regs))))
     lambda_ = await cg.process_lambda(Lambda(text), args, return_type=cg.void)

esphome/components/bq25186/binary_sensor.py

@@ -1,73 +0,0 @@
-from functools import partial
-
-import esphome.codegen as cg
-from esphome.components import binary_sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    DEVICE_CLASS_BATTERY_CHARGING,
-    DEVICE_CLASS_OPENING,
-    DEVICE_CLASS_PLUG,
-    DEVICE_CLASS_RUNNING,
-)
-from esphome.types import ConfigType
-
-from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID, bq25186_ns, register_binary_sensor
-
-DEPENDENCIES = ["bq25186"]
-
-BQ25186BinarySensor = bq25186_ns.class_(
-    "BQ25186BinarySensor", binary_sensor.BinarySensor
-)
-
-REG_STAT0 = 0
-REG_STAT1 = 1
-REG_FLAG0 = 2
-# Bit set for each field value that reads as on: a single bit is on when it is 1
-_BIT_SET = 0b10
-
-# (key, status register, bit shift, field mask, on-values bitmap, device class)
-_FIELDS = (
-    ("ts", REG_STAT0, 7, 0x01, _BIT_SET, DEVICE_CLASS_OPENING),
-    ("charging", REG_STAT0, 5, 0x03, 0b0110, DEVICE_CLASS_BATTERY_CHARGING),
-    ("charge_done", REG_STAT0, 5, 0x03, 0b1000, cv.UNDEFINED),
-    ("ilim", REG_STAT0, 4, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("vdppm", REG_STAT0, 3, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("vindpm", REG_STAT0, 2, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("thermreg", REG_STAT0, 1, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("power_good", REG_STAT0, 0, 0x01, _BIT_SET, DEVICE_CLASS_PLUG),
-    ("vin_ovp", REG_STAT1, 7, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("battery_uvlo", REG_STAT1, 6, 0x01, _BIT_SET, DEVICE_CLASS_RUNNING),
-    ("safety_timer_flag", REG_STAT1, 2, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("wake1_flag", REG_STAT1, 1, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("wake2_flag", REG_STAT1, 0, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("ts_flag", REG_FLAG0, 7, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("ilim_flag", REG_FLAG0, 6, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("vdppm_flag", REG_FLAG0, 5, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("vindpm_flag", REG_FLAG0, 4, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("thermreg_flag", REG_FLAG0, 3, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("vin_ovp_flag", REG_FLAG0, 2, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("battery_uvlo_flag", REG_FLAG0, 1, 0x01, _BIT_SET, cv.UNDEFINED),
-    ("battery_ocp_flag", REG_FLAG0, 0, 0x01, _BIT_SET, cv.UNDEFINED),
-)
-
-
-CONFIG_SCHEMA = cv.All(
-    BQ25186_CHILD_SCHEMA.extend(
-        {
-            cv.Optional(key): binary_sensor.binary_sensor_schema(
-                BQ25186BinarySensor, device_class=device_class
-            )
-            for key, *_, device_class in _FIELDS
-        }
-    ),
-    cv.has_at_least_one_key(*(key for key, *_ in _FIELDS)),
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    hub = await cg.get_variable(config[CONF_BQ25186_ID])
-    sensors = binary_sensor.sub_binary_sensors(config)
-    for key, reg, shift, mask, match, _ in _FIELDS:
-        await sensors(
-            key, partial(register_binary_sensor, hub), reg, shift, mask, match
-        )

esphome/components/bq25186/bq25186.cpp

@@ -1,10 +1,4 @@
 #include "bq25186.h"
-#ifdef USE_BINARY_SENSOR
-#include "bq25186_binary_sensor.h"
-#endif
-#ifdef USE_TEXT_SENSOR
-#include "bq25186_text_sensor.h"
-#endif
 
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
@@ -13,10 +7,10 @@ namespace esphome::bq25186 {
 
 ESPHOME_LOG_TAG(TAG, "bq25186");
 
-// Bits the configuration owns in each register; the rest are the SYS_REG GPO level, reset
-// triggers (SHIP_RST) or the device id (MASK_ID) and are kept as read
+// Bits the configuration owns in each register; the rest are runtime state (VBAT_CTRL pg_mode,
+// SYS_REG GPO level), reset triggers (SHIP_RST) or the device id (MASK_ID) and are kept as read
 static const uint8_t BQ25186_CONFIG_MASKS[BQ25186_CONFIG_REGISTER_COUNT] PROGMEM = {
-    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xEF, 0xFF, 0xF0,
+    0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x1F, 0xEF, 0xFF, 0xF0,
 };
 
 bool BQ25186Component::write_register_(uint8_t reg, uint8_t value) {
@@ -37,38 +31,16 @@ bool BQ25186Component::update_register_(uint8_t reg, uint8_t mask, uint8_t value
   return this->write_register_(reg, reg_value);
 }
 
-uint8_t BQ25186Component::expected_register_(size_t index) const {
-  uint8_t value = this->regs_[index];
-#ifdef USE_BQ25186_PG_GPO
-  if (index == 0 && this->pg_gpo_switch_ != nullptr)
-    value |= BQ25186_VBAT_CTRL_PG_MODE;
-#endif
-  return value;
-}
-
-bool BQ25186Component::config_matches_(const BQ25186StatusRegisters &regs) const {
-  for (uint8_t reg = BQ25186_REG_VBAT_CTRL; reg <= BQ25186_REG_MASK_ID; reg++) {
-    const size_t index = reg - BQ25186_REG_VBAT_CTRL;
-    const uint8_t mask = progmem_read_byte(&BQ25186_CONFIG_MASKS[index]);
-    if (((regs[reg] ^ this->expected_register_(index)) & mask) != 0)
-      return false;
-  }
-  return true;
-}
-
 bool BQ25186Component::apply_config(const BQ25186ConfigRegisters &regs) {
   // Setup rejects an unknown chip; the action must not program it before that check or after it failed
   if (!this->is_ready() || this->is_failed()) {
     ESP_LOGW(TAG, "Not applying configuration, setup has not succeeded");
     return false;
   }
-  this->regs_ = regs;
-  this->configured_ = true;
   for (size_t i = 0; i < regs.size(); i++) {
     const uint8_t reg = BQ25186_REG_VBAT_CTRL + i;
     const uint8_t mask = progmem_read_byte(&BQ25186_CONFIG_MASKS[i]);
-    const uint8_t value = this->expected_register_(i);
-    const bool ok = mask == 0xFF ? this->write_register_(reg, value) : this->update_register_(reg, mask, value);
+    const bool ok = mask == 0xFF ? this->write_register_(reg, regs[i]) : this->update_register_(reg, mask, regs[i]);
     if (!ok) {
       this->status_set_warning(LOG_STR("Configuration partly applied"));
       return false;
@@ -96,80 +68,12 @@ void BQ25186Component::setup() {
   // A failed write only sets the warning status: the chip has identified itself, so a later
   // apply_configuration may retry
   if (this->configure_on_boot_)
-    this->apply_config(this->regs_);
-#ifdef USE_BQ25186_PG_GPO
-  if (this->pg_gpo_switch_ != nullptr) {
-    // The poll below puts the pin in output mode; without a restore mode the switch takes its level from it
-    auto initial = this->pg_gpo_switch_->get_initial_state_with_restore_mode();
-    if (initial.has_value())
-      this->pg_gpo_switch_->publish_state(*initial);  // the first poll writes it to the pin
-  }
-#endif
-  // The poller first runs after a random share of the interval; the entities get a state now
-  this->update();
-}
-
-#ifdef USE_BQ25186_PG_GPO
-// The pin mode and level come from the switch, so every poll puts back whatever the chip lost
-void BQ25186Component::check_pg_gpo_(const BQ25186StatusRegisters &status, bool &pending) {
-  if (this->pg_gpo_switch_ == nullptr)
-    return;
-  if ((status[BQ25186_REG_VBAT_CTRL] & BQ25186_VBAT_CTRL_PG_MODE) == 0 &&
-      !this->update_register_(BQ25186_REG_VBAT_CTRL, BQ25186_VBAT_CTRL_PG_MODE, BQ25186_VBAT_CTRL_PG_MODE)) {
-    this->status_set_warning(LOG_STR("PG/GPO pin not in output mode"));
-    pending = true;
-  }
-  const bool level = (status[BQ25186_REG_SYS_REG] & BQ25186_SYS_REG_PG_GPO_LEVEL) != 0;
-  if (!this->pg_gpo_switch_->has_state()) {
-    this->pg_gpo_switch_->publish_state(level);
-  } else if (level != this->pg_gpo_switch_->state && !this->write_pg_gpo_level(this->pg_gpo_switch_->state)) {
-    this->status_set_warning(LOG_STR("PG/GPO level write failed"));
-    pending = true;
-  }
-}
-#endif
-
-// Every poll also serves the I2C watchdog, which wants to see traffic within its period
-void BQ25186Component::update() {
-  BQ25186StatusRegisters status;
-  if (!this->read_bytes(BQ25186_REG_STAT0, status.data(), status.size())) {
-    this->status_set_warning(LOG_STR("Status read failed"));
-    return;
-  }
-  // Whatever failed is tried again here, so the warning only stays while something is still wrong
-  bool pending = false;
-  // A watchdog or hardware reset puts the power-on values back, and a failed write leaves a register
-  // behind; either way the configuration is written again
-  if (this->configured_ && !this->config_matches_(status)) {
-    ESP_LOGW(TAG, "Configuration registers differ from the values applied, writing them again");
-    if (this->apply_config(this->regs_)) {
-      status[BQ25186_REG_VBAT_CTRL] |= BQ25186_VBAT_CTRL_PG_MODE;  // part of the write when a switch is configured
-    } else {
-      pending = true;
-    }
-  }
-#ifdef USE_BQ25186_PG_GPO
-  this->check_pg_gpo_(status, pending);
-#endif
-  if (!pending)
-    this->status_clear_warning();
-#ifdef BQ25186_BINARY_SENSOR_COUNT
-  for (auto *sensor : this->binary_sensors_)
-    sensor->on_status(status);
-#endif
-#ifdef BQ25186_TEXT_SENSOR_COUNT
-  for (auto *sensor : this->text_sensors_)
-    sensor->on_status(status);
-#endif
+    this->apply_config(this->setup_regs_);
 }
 
 void BQ25186Component::dump_config() {
   ESP_LOGCONFIG(TAG, "BQ25186:");
   LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-#ifdef USE_BQ25186_PG_GPO
-  LOG_SWITCH("  ", "PG/GPO", this->pg_gpo_switch_);
-#endif
 }
 
 }  // namespace esphome::bq25186

esphome/components/bq25186/bq25186.h

@@ -2,19 +2,11 @@
 
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/helpers.h"
-#ifdef USE_BQ25186_PG_GPO
-#include "esphome/components/switch/switch.h"
-#endif
 
 #include <array>
 
 namespace esphome::bq25186 {
 
-static constexpr uint8_t BQ25186_REG_STAT0 = 0x00;
-static constexpr uint8_t BQ25186_REG_STAT1 = 0x01;
-static constexpr uint8_t BQ25186_REG_FLAG0 = 0x02;
 static constexpr uint8_t BQ25186_REG_VBAT_CTRL = 0x03;
 static constexpr uint8_t BQ25186_REG_ICHG_CTRL = 0x04;
 static constexpr uint8_t BQ25186_REG_CHARGECTRL0 = 0x05;
@@ -26,70 +18,27 @@ static constexpr uint8_t BQ25186_REG_SYS_REG = 0x0A;
 static constexpr uint8_t BQ25186_REG_TS_CONTROL = 0x0B;
 static constexpr uint8_t BQ25186_REG_MASK_ID = 0x0C;
 static constexpr size_t BQ25186_CONFIG_REGISTER_COUNT = BQ25186_REG_MASK_ID - BQ25186_REG_VBAT_CTRL + 1;
-// STAT0 to MASK_ID, read together by every poll: the status for the entities, then the configuration
-// registers, which show whether the chip was reset or a write failed
-static constexpr size_t BQ25186_STATUS_REGISTER_COUNT = BQ25186_REG_MASK_ID - BQ25186_REG_STAT0 + 1;
-
-// VBAT_CTRL pg_mode: the /PG pin is a general purpose output driven by SYS_REG pg_gpo_level
-static constexpr uint8_t BQ25186_VBAT_CTRL_PG_MODE = 0x80;
-static constexpr uint8_t BQ25186_SYS_REG_PG_GPO_LEVEL = 0x10;
 
 // Register values for VBAT_CTRL..MASK_ID, packed by code generation
 using BQ25186ConfigRegisters = std::array<uint8_t, BQ25186_CONFIG_REGISTER_COUNT>;
-using BQ25186StatusRegisters = std::array<uint8_t, BQ25186_STATUS_REGISTER_COUNT>;
 
-class BQ25186BinarySensor;
-class BQ25186TextSensor;
-
-class BQ25186Component : public PollingComponent, public i2c::I2CDevice {
+class BQ25186Component : public Component, public i2c::I2CDevice {
  public:
   void setup() override;
-  void update() override;
   void dump_config() override;
 
   void set_setup_registers(const BQ25186ConfigRegisters &regs) {
-    this->regs_ = regs;
+    this->setup_regs_ = regs;
     this->configure_on_boot_ = true;
   }
   bool apply_config(const BQ25186ConfigRegisters &regs);
-#ifdef BQ25186_BINARY_SENSOR_COUNT
-  void register_binary_sensor(BQ25186BinarySensor *sensor) { this->binary_sensors_.push_back(sensor); }
-#endif
-#ifdef BQ25186_TEXT_SENSOR_COUNT
-  void register_text_sensor(BQ25186TextSensor *sensor) { this->text_sensors_.push_back(sensor); }
-#endif
-#ifdef USE_BQ25186_PG_GPO
-  /// The /PG/GPO pin is put in general purpose output mode when a switch drives it
-  void set_pg_gpo_switch(switch_::Switch *pg_gpo_switch) { this->pg_gpo_switch_ = pg_gpo_switch; }
-  bool write_pg_gpo_level(bool level) {
-    return this->update_register_(BQ25186_REG_SYS_REG, BQ25186_SYS_REG_PG_GPO_LEVEL,
-                                  level ? BQ25186_SYS_REG_PG_GPO_LEVEL : 0);
-  }
-#endif
-  /// Write the masked bits of SHIP_RST
-  bool write_ship_rst(uint8_t mask, uint8_t value) { return this->update_register_(BQ25186_REG_SHIP_RST, mask, value); }
 
  protected:
   bool write_register_(uint8_t reg, uint8_t value);
-  uint8_t expected_register_(size_t index) const;
-  bool config_matches_(const BQ25186StatusRegisters &regs) const;
-#ifdef USE_BQ25186_PG_GPO
-  void check_pg_gpo_(const BQ25186StatusRegisters &status, bool &pending);
-#endif
   bool update_register_(uint8_t reg, uint8_t mask, uint8_t value);
 
-#ifdef BQ25186_BINARY_SENSOR_COUNT
-  StaticVector<BQ25186BinarySensor *, BQ25186_BINARY_SENSOR_COUNT> binary_sensors_;
-#endif
-#ifdef BQ25186_TEXT_SENSOR_COUNT
-  StaticVector<BQ25186TextSensor *, BQ25186_TEXT_SENSOR_COUNT> text_sensors_;
-#endif
-#ifdef USE_BQ25186_PG_GPO
-  switch_::Switch *pg_gpo_switch_{nullptr};
-#endif
-  BQ25186ConfigRegisters regs_{};  // the configuration last applied, written again after a chip reset
+  BQ25186ConfigRegisters setup_regs_{};
   bool configure_on_boot_{false};
-  bool configured_{false};  // regs_ went to the chip at least once
 };
 
 }  // namespace esphome::bq25186

esphome/components/bq25186/bq25186_binary_sensor.h

@@ -1,31 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#ifdef USE_BINARY_SENSOR
-
-#include "bq25186.h"
-#include "esphome/components/binary_sensor/binary_sensor.h"
-
-namespace esphome::bq25186 {
-
-/// One field of a status register; `match` has a bit set for each field value that reads as on
-class BQ25186BinarySensor final : public binary_sensor::BinarySensor {
- public:
-  BQ25186BinarySensor(uint8_t reg, uint8_t shift, uint8_t mask, uint8_t match)
-      : reg_(reg), shift_(shift), mask_(mask), match_(match) {}
-
-  void on_status(const BQ25186StatusRegisters &status) {
-    const uint8_t value = (status[this->reg_] >> this->shift_) & this->mask_;
-    this->publish_state((this->match_ >> value) & 1);
-  }
-
- protected:
-  const uint8_t reg_;
-  const uint8_t shift_;
-  const uint8_t mask_;
-  const uint8_t match_;
-};
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_BINARY_SENSOR

esphome/components/bq25186/bq25186_button.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#ifdef USE_BUTTON
-
-#include "bq25186.h"
-#include "esphome/components/button/button.h"
-
-namespace esphome::bq25186 {
-
-/// Writes one SHIP_RST field when pressed
-class BQ25186Button final : public button::Button, public Parented<BQ25186Component> {
- public:
-  BQ25186Button(uint8_t mask, uint8_t value) : mask_(mask), value_(value) {}
-
- protected:
-  void press_action() override { this->parent_->write_ship_rst(this->mask_, this->value_); }
-
-  const uint8_t mask_;
-  const uint8_t value_;
-};
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_BUTTON

esphome/components/bq25186/bq25186_switch.h

@@ -1,21 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#ifdef USE_BQ25186_PG_GPO
-
-#include "bq25186.h"
-#include "esphome/components/switch/switch.h"
-
-namespace esphome::bq25186 {
-
-class BQ25186PgGpoSwitch final : public switch_::Switch, public Parented<BQ25186Component> {
- protected:
-  void write_state(bool state) override {
-    if (this->parent_->write_pg_gpo_level(state))
-      this->publish_state(state);
-  }
-};
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_BQ25186_PG_GPO

esphome/components/bq25186/bq25186_text_sensor.cpp

@@ -1,26 +0,0 @@
-#include "bq25186_text_sensor.h"
-#ifdef USE_TEXT_SENSOR
-
-#include "esphome/core/progmem.h"
-
-namespace esphome::bq25186 {
-
-// STAT0[6:5] charge status, then STAT1[4:3] TS status
-PROGMEM_STRING_TABLE(StatusStrings, "Not Charging", "Constant Current", "Constant Voltage", "Charge Done/Disabled",
-                     "Normal", "Hot/Cold (Charging Suspended)", "Cool (Current Reduced)", "Warm (Voltage Reduced)");
-
-void BQ25186TextSensor::on_status(const BQ25186StatusRegisters &status) {
-  const uint8_t value = (status[this->reg_] >> this->shift_) & 0x03;
-  if (value == this->last_)
-    return;
-  this->last_ = value;
-  const ProgmemStr name = StatusStrings::get_progmem_str(this->first_ + value, StatusStrings::LAST_INDEX);
-  char text[32];
-  ESPHOME_strncpy_P(text, reinterpret_cast<ESPHOME_PGM_P>(name), sizeof(text));
-  text[sizeof(text) - 1] = '\0';
-  this->publish_state(text);
-}
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_TEXT_SENSOR

esphome/components/bq25186/bq25186_text_sensor.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include "esphome/core/defines.h"
-#ifdef USE_TEXT_SENSOR
-
-#include "bq25186.h"
-#include "esphome/components/text_sensor/text_sensor.h"
-
-namespace esphome::bq25186 {
-
-/// A two-bit status field; `first` is the string table index of the field's value 0
-class BQ25186TextSensor final : public text_sensor::TextSensor {
- public:
-  BQ25186TextSensor(uint8_t reg, uint8_t shift, uint8_t first) : reg_(reg), shift_(shift), first_(first) {}
-  void on_status(const BQ25186StatusRegisters &status);
-
- protected:
-  const uint8_t reg_;
-  const uint8_t shift_;
-  const uint8_t first_;
-  uint8_t last_{0xFF};  // the field value last published
-};
-
-}  // namespace esphome::bq25186
-
-#endif  // USE_TEXT_SENSOR

esphome/components/bq25186/button.py

@@ -1,52 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import button
-import esphome.config_validation as cv
-from esphome.const import (
-    DEVICE_CLASS_RESTART,
-    ENTITY_CATEGORY_CONFIG,
-    ICON_POWER,
-    ICON_RESTART,
-    ICON_RESTART_ALERT,
-)
-from esphome.types import ConfigType
-
-from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID, bq25186_ns
-
-DEPENDENCIES = ["bq25186"]
-
-BQ25186Button = bq25186_ns.class_("BQ25186Button", button.Button)
-
-# SHIP_RST: bit 7 is the software reset, bits 6:5 the shutdown, ship and hardware reset codes
-SOFTWARE_RESET_MASK = 0x80
-MODE_MASK = 0x60
-
-# (key, SHIP_RST mask, value, device class, icon)
-_BUTTONS = (
-    ("software_reset", SOFTWARE_RESET_MASK, 0x80, DEVICE_CLASS_RESTART, ICON_RESTART),
-    ("shutdown", MODE_MASK, 0x20, cv.UNDEFINED, ICON_POWER),
-    ("ship_mode", MODE_MASK, 0x40, cv.UNDEFINED, ICON_POWER),
-    ("hardware_reset", MODE_MASK, 0x60, DEVICE_CLASS_RESTART, ICON_RESTART_ALERT),
-)
-
-
-CONFIG_SCHEMA = cv.All(
-    BQ25186_CHILD_SCHEMA.extend(
-        {
-            cv.Optional(key): button.button_schema(
-                BQ25186Button,
-                entity_category=ENTITY_CATEGORY_CONFIG,
-                icon=icon,
-                device_class=device_class,
-            )
-            for key, _, _, device_class, icon in _BUTTONS
-        }
-    ),
-    cv.has_at_least_one_key(*(key for key, *_ in _BUTTONS)),
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    for key, mask, value, _, _ in _BUTTONS:
-        if (conf := config.get(key)) is not None:
-            var = await button.new_button(conf, mask, value)
-            await cg.register_parented(var, config[CONF_BQ25186_ID])

esphome/components/bq25186/switch.py

@@ -1,27 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import switch
-import esphome.config_validation as cv
-from esphome.types import ConfigType
-
-from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID, bq25186_ns
-
-DEPENDENCIES = ["bq25186"]
-
-CONF_PG_GPO = "pg_gpo"
-
-BQ25186PgGpoSwitch = bq25186_ns.class_("BQ25186PgGpoSwitch", switch.Switch)
-
-CONFIG_SCHEMA = BQ25186_CHILD_SCHEMA.extend(
-    {
-        cv.Required(CONF_PG_GPO): switch.switch_schema(
-            BQ25186PgGpoSwitch, default_restore_mode="DISABLED"
-        ),
-    }
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    cg.add_define("USE_BQ25186_PG_GPO")
-    hub = await cg.get_variable(config[CONF_BQ25186_ID])
-    switches = switch.sub_switches(config, parent=hub)
-    await switches(CONF_PG_GPO, hub.set_pg_gpo_switch)

esphome/components/bq25186/text_sensor.py

@@ -1,38 +0,0 @@
-from functools import partial
-
-import esphome.codegen as cg
-from esphome.components import text_sensor
-import esphome.config_validation as cv
-from esphome.types import ConfigType
-
-from . import BQ25186_CHILD_SCHEMA, CONF_BQ25186_ID, bq25186_ns, register_text_sensor
-
-DEPENDENCIES = ["bq25186"]
-
-BQ25186TextSensor = bq25186_ns.class_("BQ25186TextSensor", text_sensor.TextSensor)
-
-REG_STAT0 = 0
-REG_STAT1 = 1
-
-# (key, status register, bit shift, index of the field's value 0 in the C++ string table)
-_FIELDS = (
-    ("charge_status", REG_STAT0, 5, 0),
-    ("ts_status", REG_STAT1, 3, 4),
-)
-
-CONFIG_SCHEMA = cv.All(
-    BQ25186_CHILD_SCHEMA.extend(
-        {
-            cv.Optional(key): text_sensor.text_sensor_schema(BQ25186TextSensor)
-            for key, *_ in _FIELDS
-        }
-    ),
-    cv.has_at_least_one_key(*(key for key, *_ in _FIELDS)),
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    hub = await cg.get_variable(config[CONF_BQ25186_ID])
-    sensors = text_sensor.sub_text_sensors(config)
-    for key, reg, shift, first in _FIELDS:
-        await sensors(key, partial(register_text_sensor, hub), reg, shift, first)

esphome/components/bq76972/__init__.py

@@ -1,111 +0,0 @@
-from esphome import automation
-import esphome.codegen as cg
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ADDRESS,
-    CONF_ID,
-    DEVICE_CLASS_TEMPERATURE,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_CELSIUS,
-    UNIT_VOLT,
-)
-from esphome.types import ConfigType
-
-AUTO_LOAD = ["sensor"]
-CODEOWNERS = ["@limpkin"]
-DEPENDENCIES = ["i2c"]
-DOMAIN = "bq76972"
-MULTI_CONF = True
-
-bq76972_ns = cg.esphome_ns.namespace("bq76972")
-BQ76972Component = bq76972_ns.class_(
-    "BQ76972Component", cg.PollingComponent, i2c.I2CDevice
-)
-
-CONF_REG_DISABLED = "reg_disabled"
-CONF_CRC_ENABLED = "crc_enabled"
-CONF_STACK_VOLTAGE = "stack_voltage"
-
-# Ordered as the chip reports them, starting at command 0x68
-CONF_TEMPERATURES = [
-    "internal_temperature",
-    "cfetoff_temperature",
-    "dfetoff_temperature",
-    "alert_temperature",
-    "ts1_temperature",
-    "ts2_temperature",
-    "ts3_temperature",
-    "hdq_temperature",
-    "dchg_temperature",
-    "ddsg_temperature",
-]
-
-CONF_CELL_VOLTAGES = [f"cell_{i}_voltage" for i in range(1, 17)]
-
-voltage_sensor_schema = sensor.sensor_schema(
-    unit_of_measurement=UNIT_VOLT,
-    accuracy_decimals=3,
-    device_class=DEVICE_CLASS_VOLTAGE,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-
-temp_sensor_schema = sensor.sensor_schema(
-    unit_of_measurement=UNIT_CELSIUS,
-    accuracy_decimals=1,
-    device_class=DEVICE_CLASS_TEMPERATURE,
-    state_class=STATE_CLASS_MEASUREMENT,
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(BQ76972Component),
-            cv.Optional(CONF_CRC_ENABLED, default=False): cv.boolean,
-            cv.Optional(CONF_REG_DISABLED, default=False): cv.boolean,
-            cv.Optional(CONF_STACK_VOLTAGE): voltage_sensor_schema,
-            **{cv.Optional(key): voltage_sensor_schema for key in CONF_CELL_VOLTAGES},
-            **{cv.Optional(key): temp_sensor_schema for key in CONF_TEMPERATURES},
-        }
-    )
-    .extend(i2c.i2c_device_schema(0x08))
-    .extend(cv.polling_component_schema("10s"))
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    cg.add(var.set_crc_mode(config[CONF_CRC_ENABLED]))
-    cg.add(var.set_reg_disable(config[CONF_REG_DISABLED]))
-
-    sensors = sensor.sub_sensors(config)
-    await sensors(CONF_STACK_VOLTAGE, var.set_stack_voltage_sensor)
-
-    for idx, key in enumerate(CONF_TEMPERATURES):
-        if (conf := config.get(key)) is not None:
-            sens = await sensor.new_sensor(conf)
-            cg.add(var.set_temperature_sensor(sens, idx))
-
-    for idx, key in enumerate(CONF_CELL_VOLTAGES):
-        if (conf := config.get(key)) is not None:
-            sens = await sensor.new_sensor(conf)
-            cg.add(var.set_cell_sensor(sens, idx))
-
-
-BQ76972_PROGRAM_I2C_ADDRESS_SCHEMA = cv.maybe_simple_value(
-    {
-        cv.GenerateID(): cv.use_id(BQ76972Component),
-        cv.Required(CONF_ADDRESS): cv.templatable(cv.i2c_address),
-    },
-    key=CONF_ADDRESS,
-)
-
-automation.register_apply_action(
-    "bq76972.program_i2c_address",
-    BQ76972_PROGRAM_I2C_ADDRESS_SCHEMA,
-    automation.ApplyField(CONF_ADDRESS, "program_i2c_address", cg.uint8),
-)

esphome/components/bq76972/bq76972.cpp

@@ -1,298 +0,0 @@
-#include "bq76972.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome::bq76972 {
-
-ESPHOME_LOG_TAG(TAG, "bq76972");
-
-static constexpr uint8_t BQ76972_REG_SUBCOMMAND = 0x3E;  // 0x3E low byte, 0x3F high byte
-static constexpr uint8_t BQ76972_REG_TRANSFER_BUFFER = 0x40;
-static constexpr uint8_t BQ76972_REG_CHECKSUM = 0x60;  // 0x60 checksum, 0x61 length
-static constexpr uint8_t BQ76972_CMD_BAT_STATUS = 0x12;
-static constexpr uint8_t BQ76972_CMD_CELL_START = 0x14;
-static constexpr uint8_t BQ76972_CMD_STACK_VOLTAGE = 0x34;
-static constexpr uint8_t BQ76972_CMD_TEMP_START = 0x68;
-static constexpr uint16_t BQ76972_SUBCMD_ENTER_CFG_UPDATE = 0x0090;
-static constexpr uint16_t BQ76972_SUBCMD_EXIT_CFG_UPDATE = 0x0092;
-static constexpr uint16_t BQ76972_MEM_REG12_CONFIG = 0x9236;
-static constexpr uint16_t BQ76972_MEM_REG0_CONFIG = 0x9237;
-static constexpr uint16_t BQ76972_MEM_I2C_ADDRESS = 0x923A;
-static constexpr uint16_t BQ76972_MEM_SWAP_COMM_MODE = 0x29BC;
-// Pin config of temperature reading N (1 = CFETOFF ... 9 = DDSG) is at this base + N
-static constexpr uint16_t BQ76972_MEM_TEMP_PIN_CONFIG_BASE = 0x92F9;
-static constexpr size_t BQ76972_TS1_INDEX = 4;  // a thermistor input by default
-static constexpr uint8_t BQ76972_PIN_CONFIG_THERMISTOR = 0x07;
-
-// 16 words with a CRC byte after every data byte
-static constexpr size_t BQ76972_MAX_TRANSFER = 64;
-static constexpr uint8_t BQ76972_MAX_POLLS = 50;
-
-static float raw_to_celsius(uint16_t raw) { return static_cast<int16_t>(raw) * 0.1f - 273.15f; }
-
-bool BQ76972Component::read_block_(uint8_t start_register, uint8_t *data, size_t len) {
-  if (!this->crc_mode_)
-    return this->read_bytes(start_register, data, len);
-
-  // With CRC enabled, every data byte is followed by a CRC byte
-  std::array<uint8_t, BQ76972_MAX_TRANSFER> buffer;
-  if (len == 0 || len * 2 > buffer.size())
-    return false;
-  if (!this->read_bytes(start_register, buffer.data(), len * 2))
-    return false;
-
-  // The first CRC also covers the write address, register and read address
-  const uint8_t crc0_input[4] = {static_cast<uint8_t>(this->address_ << 1), start_register,
-                                 static_cast<uint8_t>((this->address_ << 1) | 1), buffer[0]};
-  if (crc8(crc0_input, 4, 0x00, 0x07, true) != buffer[1]) {
-    ESP_LOGD(TAG, "CRC mismatch at register 0x%02X byte 0", start_register);
-    return false;
-  }
-  data[0] = buffer[0];
-  for (size_t i = 1; i < len; ++i) {
-    if (crc8(&buffer[i * 2], 1, 0x00, 0x07, true) != buffer[i * 2 + 1]) {
-      ESP_LOGD(TAG, "CRC mismatch at register 0x%02X byte %u", start_register, static_cast<unsigned>(i));
-      return false;
-    }
-    data[i] = buffer[i * 2];
-  }
-  return true;
-}
-
-bool BQ76972Component::write_block_(uint8_t start_register, const uint8_t *data, size_t len) {
-  if (!this->crc_mode_)
-    return this->write_bytes(start_register, data, len);
-
-  std::array<uint8_t, BQ76972_MAX_TRANSFER> buffer;
-  if (len == 0 || len * 2 > buffer.size())
-    return false;
-
-  // The first CRC also covers the write address and register
-  const uint8_t crc0_input[3] = {static_cast<uint8_t>(this->address_ << 1), start_register, data[0]};
-  buffer[0] = data[0];
-  buffer[1] = crc8(crc0_input, 3, 0x00, 0x07, true);
-  for (size_t i = 1; i < len; ++i) {
-    buffer[i * 2] = data[i];
-    buffer[i * 2 + 1] = crc8(&data[i], 1, 0x00, 0x07, true);
-  }
-  return this->write_bytes(start_register, buffer.data(), len * 2);
-}
-
-bool BQ76972Component::read_words_(uint8_t start_register, uint16_t *data, size_t num_words) {
-  std::array<uint8_t, BQ76972_MAX_TRANSFER / 2> bytes;
-  if (num_words * 2 > bytes.size() || !this->read_block_(start_register, bytes.data(), num_words * 2))
-    return false;
-  for (size_t i = 0; i < num_words; i++)
-    data[i] = encode_uint16(bytes[2 * i + 1], bytes[2 * i]);
-  return true;
-}
-
-bool BQ76972Component::send_subcommand_(uint16_t subcommand) {
-  const uint8_t bytes[2] = {static_cast<uint8_t>(subcommand & 0xFF), static_cast<uint8_t>(subcommand >> 8)};
-  return this->write_block_(BQ76972_REG_SUBCOMMAND, bytes, 2);
-}
-
-bool BQ76972Component::wait_for_subcommand_() {
-  uint8_t bytes[2];
-  for (uint8_t i = 0; i < BQ76972_MAX_POLLS; i++) {
-    if (!this->read_block_(BQ76972_REG_SUBCOMMAND, bytes, 2))
-      return false;
-    if (bytes[0] != 0xFF && bytes[1] != 0xFF)
-      return true;
-    delay(1);
-  }
-  return false;
-}
-
-bool BQ76972Component::wait_for_cfgupdate_() {
-  uint16_t status;
-  for (uint8_t i = 0; i < BQ76972_MAX_POLLS; i++) {
-    if (!this->read_words_(BQ76972_CMD_BAT_STATUS, &status, 1))
-      return false;
-    if (status & 0x0001)
-      return true;
-    delay(1);
-  }
-  return false;
-}
-
-bool BQ76972Component::read_subcommand_(uint16_t subcommand, uint8_t *data, size_t len) {
-  return this->send_subcommand_(subcommand) && this->wait_for_subcommand_() &&
-         this->read_block_(BQ76972_REG_TRANSFER_BUFFER, data, len);
-}
-
-bool BQ76972Component::write_subcommand_(uint16_t subcommand, const uint8_t *data, size_t len) {
-  if (!this->send_subcommand_(subcommand))
-    return false;
-  if (len == 0)
-    return true;
-  if (!this->write_block_(BQ76972_REG_TRANSFER_BUFFER, data, len))
-    return false;
-
-  // Inverted 8-bit sum of 0x3E, 0x3F and the data; length counts 0x3E, 0x3F, 0x60, 0x61 and the data
-  uint8_t sum = static_cast<uint8_t>(subcommand & 0xFF) + static_cast<uint8_t>(subcommand >> 8);
-  for (size_t i = 0; i < len; ++i)
-    sum += data[i];
-  const uint8_t tail[2] = {static_cast<uint8_t>(~sum), static_cast<uint8_t>(4 + len)};
-  return this->write_block_(BQ76972_REG_CHECKSUM, tail, 2);
-}
-
-bool BQ76972Component::enter_cfg_update_() {
-  if (!this->write_subcommand_(BQ76972_SUBCMD_ENTER_CFG_UPDATE, nullptr, 0))
-    return false;
-  delay(10);
-  return this->wait_for_cfgupdate_();
-}
-
-bool BQ76972Component::exit_cfg_update_() {
-  return this->write_subcommand_(BQ76972_SUBCMD_EXIT_CFG_UPDATE, nullptr, 0);
-}
-
-bool BQ76972Component::regs_disabled_(bool &out) {
-  uint8_t reg12;
-  uint8_t reg0;
-  if (!this->read_subcommand_(BQ76972_MEM_REG12_CONFIG, &reg12, 1) ||
-      !this->read_subcommand_(BQ76972_MEM_REG0_CONFIG, &reg0, 1))
-    return false;
-  out = reg12 == 0 && (reg0 & 0x01) == 0;
-  return true;
-}
-
-const LogString *BQ76972Component::configure_() {
-  uint16_t internal_temp;
-  if (!this->read_words_(BQ76972_CMD_TEMP_START, &internal_temp, 1))
-    return LOG_STR(ESP_LOG_MSG_COMM_FAIL);
-
-  // Only write the regulator config when it differs, see
-  // https://e2e.ti.com/support/power-management-group/power-management/f/power-management-forum/1583718/bq76972-undocumented-4-minute-config_update-auto-exit-timeout
-  bool regs_disabled = true;
-  if (this->reg_disable_ && !this->regs_disabled_(regs_disabled))
-    return LOG_STR("Reading regulator config failed");
-  const bool write_regs = !regs_disabled;
-
-  bool write_thermistors = false;
-  for (size_t i = 1; i < BQ76972_NUM_TEMPERATURES; i++) {
-    if (i != BQ76972_TS1_INDEX && this->temperature_sensors_[i] != nullptr)
-      write_thermistors = true;
-  }
-
-  if (write_regs || write_thermistors) {
-    if (!this->enter_cfg_update_())
-      return LOG_STR("Entering config update mode failed");
-    const LogString *error = this->write_config_(write_regs);
-    // The chip stops measuring in config update mode, so leave it even after a failed write
-    if (!this->exit_cfg_update_() && error == nullptr)
-      error = LOG_STR("Exiting config update mode failed");
-    if (error != nullptr)
-      return error;
-    if (write_regs && (!this->regs_disabled_(regs_disabled) || !regs_disabled))
-      return LOG_STR("Disabling regulators failed");
-  }
-
-  ESP_LOGD(TAG, "Internal temperature: %.1f°C", raw_to_celsius(internal_temp));
-  return nullptr;
-}
-
-const LogString *BQ76972Component::write_config_(bool write_regs) {
-  if (write_regs) {
-    const uint8_t zero = 0;
-    if (!this->write_subcommand_(BQ76972_MEM_REG12_CONFIG, &zero, 1) ||
-        !this->write_subcommand_(BQ76972_MEM_REG0_CONFIG, &zero, 1))
-      return LOG_STR("Writing regulator config failed");
-  }
-  for (size_t i = 1; i < BQ76972_NUM_TEMPERATURES; i++) {
-    if (i == BQ76972_TS1_INDEX || this->temperature_sensors_[i] == nullptr)
-      continue;
-    if (!this->write_subcommand_(BQ76972_MEM_TEMP_PIN_CONFIG_BASE + i, &BQ76972_PIN_CONFIG_THERMISTOR, 1))
-      return LOG_STR("Writing thermistor pin config failed");
-  }
-  return nullptr;
-}
-
-void BQ76972Component::setup() {
-  if (const LogString *error = this->configure_(); error != nullptr)
-    this->mark_failed(error);
-}
-
-void BQ76972Component::dump_config() {
-  ESP_LOGCONFIG(TAG, "BQ76972:");
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-  ESP_LOGCONFIG(TAG,
-                "  CRC Mode: %s\n"
-                "  Regulators disabled: %s",
-                this->crc_mode_ ? LOG_STR_LITERAL("Enabled") : LOG_STR_LITERAL("Disabled"), YESNO(this->reg_disable_));
-}
-
-void BQ76972Component::program_i2c_address(uint8_t address) {
-  if (this->is_failed())
-    return;
-  const uint8_t shifted = address << 1;
-  if (!this->enter_cfg_update_()) {
-    this->status_set_warning(LOG_STR("Programming I2C address failed"));
-    return;
-  }
-  // The new address only takes effect with the swap, so after a failed write the chip still answers at the
-  // old one and must still be taken out of config update mode
-  const bool written = this->write_subcommand_(BQ76972_MEM_I2C_ADDRESS, &shifted, 1) &&
-                       this->write_subcommand_(BQ76972_MEM_SWAP_COMM_MODE, nullptr, 0);
-  if (written) {
-    delay(10);
-    this->set_i2c_address(address);
-  }
-  if (!this->exit_cfg_update_() || !written) {
-    this->status_set_warning(LOG_STR("Programming I2C address failed"));
-    return;
-  }
-  ESP_LOGI(TAG, "I2C address set to 0x%02X", address);
-}
-
-template<size_t N> static bool any_set(const std::array<sensor::Sensor *, N> &sensors) {
-  for (auto *sensor : sensors) {
-    if (sensor != nullptr)
-      return true;
-  }
-  return false;
-}
-
-void BQ76972Component::update() {
-  // Each group publishes as soon as its read succeeds, so one failed read does not hold back the others
-  bool ok = true;
-  uint16_t words[BQ76972_NUM_CELLS];
-  if (this->stack_voltage_sensor_ != nullptr) {
-    if (this->read_words_(BQ76972_CMD_STACK_VOLTAGE, words, 1)) {
-      if (words[0] != 0)
-        this->stack_voltage_sensor_->publish_state(words[0] * 0.01f);  // 10 mV units
-    } else {
-      ok = false;
-    }
-  }
-  if (any_set(this->cell_sensors_)) {
-    if (this->read_words_(BQ76972_CMD_CELL_START, words, BQ76972_NUM_CELLS)) {
-      for (size_t i = 0; i < BQ76972_NUM_CELLS; i++) {
-        if (this->cell_sensors_[i] != nullptr && words[i] != 0)
-          this->cell_sensors_[i]->publish_state(words[i] * 0.001f);  // mV
-      }
-    } else {
-      ok = false;
-    }
-  }
-  if (any_set(this->temperature_sensors_)) {
-    if (this->read_words_(BQ76972_CMD_TEMP_START, words, BQ76972_NUM_TEMPERATURES)) {
-      for (size_t i = 0; i < BQ76972_NUM_TEMPERATURES; i++) {
-        if (this->temperature_sensors_[i] != nullptr)
-          this->temperature_sensors_[i]->publish_state(raw_to_celsius(words[i]));
-      }
-    } else {
-      ok = false;
-    }
-  }
-  if (ok) {
-    this->status_clear_warning();
-  } else {
-    this->status_set_warning(LOG_STR(ESP_LOG_MSG_COMM_FAIL));
-  }
-}
-
-}  // namespace esphome::bq76972

esphome/components/bq76972/bq76972.h

@@ -1,51 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/core/component.h"
-
-#include <array>
-
-namespace esphome::bq76972 {
-
-static constexpr size_t BQ76972_NUM_CELLS = 16;
-static constexpr size_t BQ76972_NUM_TEMPERATURES = 10;
-
-class BQ76972Component final : public PollingComponent, public i2c::I2CDevice {
- public:
-  void setup() override;
-  void update() override;
-  void dump_config() override;
-
-  void set_crc_mode(bool crc_mode) { this->crc_mode_ = crc_mode; }
-  void set_reg_disable(bool reg_disable) { this->reg_disable_ = reg_disable; }
-  void set_stack_voltage_sensor(sensor::Sensor *s) { this->stack_voltage_sensor_ = s; }
-  void set_cell_sensor(sensor::Sensor *s, size_t index) { this->cell_sensors_[index] = s; }
-  void set_temperature_sensor(sensor::Sensor *s, size_t index) { this->temperature_sensors_[index] = s; }
-
-  void program_i2c_address(uint8_t address);
-
- protected:
-  bool read_block_(uint8_t start_register, uint8_t *data, size_t len);
-  bool write_block_(uint8_t start_register, const uint8_t *data, size_t len);
-  bool read_words_(uint8_t start_register, uint16_t *data, size_t num_words);
-  bool send_subcommand_(uint16_t subcommand);
-  bool read_subcommand_(uint16_t subcommand, uint8_t *data, size_t len);
-  bool write_subcommand_(uint16_t subcommand, const uint8_t *data, size_t len);
-  bool wait_for_subcommand_();
-  bool wait_for_cfgupdate_();
-  bool enter_cfg_update_();
-  bool exit_cfg_update_();
-  bool regs_disabled_(bool &out);
-  const LogString *configure_();
-  const LogString *write_config_(bool write_regs);
-
-  bool reg_disable_{false};
-  bool crc_mode_{false};
-
-  sensor::Sensor *stack_voltage_sensor_{nullptr};
-  std::array<sensor::Sensor *, BQ76972_NUM_CELLS> cell_sensors_{};
-  std::array<sensor::Sensor *, BQ76972_NUM_TEMPERATURES> temperature_sensors_{};
-};
-
-}  // namespace esphome::bq76972

esphome/components/chsc6x/chsc6x_touchscreen.h

@@ -8,7 +8,7 @@
 
 namespace esphome::chsc6x {
 
-ESPHOME_LOG_TAG(TAG, "chsc6x.touchscreen");
+static const char *const TAG = "chsc6x.touchscreen";
 
 static const uint8_t CHSC6X_REG_STATUS = 0x00;
 static const uint8_t CHSC6X_REG_STATUS_TOUCH = 0x00;

esphome/components/const/__init__.py

@@ -59,7 +59,6 @@ CONF_REQUEST_HEADERS = "request_headers"
 CONF_ROLE = "role"
 CONF_ROWS = "rows"
 CONF_SCAN_PARAMETERS = "scan_parameters"
-CONF_SERIAL_NUMBER = "serial_number"
 CONF_SHA256 = "sha256"
 CONF_SLOT = "slot"
 CONF_STATE_SAVE_INTERVAL = "state_save_interval"

esphome/components/cse7766/cse7766.cpp

@@ -8,9 +8,6 @@ namespace esphome::cse7766 {
 
 ESPHOME_LOG_TAG(TAG, "cse7766");
 
-// The chip only sends the time since the last pulse once a cycle is longer than 1 s (in us)
-static constexpr uint32_t MIN_HELD_POWER_CYCLE = 1000000;
-
 void CSE7766Component::loop() {
   const uint32_t now = App.get_loop_component_start_time();
   if (now - this->last_transmission_ >= 500) {
@@ -157,33 +154,18 @@ void CSE7766Component::parse_data_() {
   if (power_cycle_exceeds_range) {
     // Datasheet: power cycle exceeding range means active power is 0
     have_power = true;
-    this->last_power_cycle_ = 0;
     if (this->power_sensor_ != nullptr) {
       this->power_sensor_->publish_state(0.0f);
     }
   } else if (have_power) {
     power = power_coeff / float(power_cycle);
-    this->last_power_cycle_ = power_cycle;
     if (this->power_sensor_ != nullptr) {
       this->power_sensor_->publish_state(power);
     }
-  } else if (this->last_power_cycle_ > MIN_HELD_POWER_CYCLE && power_cycle <= 2 * this->last_power_cycle_) {
-    // No new measurement in this frame. With cycles over 1 s the register holds the last
-    // cycle or the time elapsed since the last pulse. While that time is within twice the
-    // last cycle, the next pulse is not overdue, so the last measurement still applies.
-    // Shorter cycles never get here in normal operation and keep the previous behaviour.
-    have_power = true;
-    power = power_coeff / float(this->last_power_cycle_);
-    if (this->power_sensor_ != nullptr) {
-      this->power_sensor_->publish_state(power);
-    }
-  } else {
-    // The next pulse is overdue: the load has dropped, report 0 W. A load that drops to less
-    // than half also reads 0 W here until its first new pulse arrives.
-    this->last_power_cycle_ = 0;
-    if (this->power_sensor_ != nullptr) {
-      this->power_sensor_->publish_state(0.0f);
-    }
+  } else if (this->power_sensor_ != nullptr) {
+    // No valid power measurement from chip - publish 0W to avoid stale readings
+    // This typically happens when current is below the measurable threshold (~50mA)
+    this->power_sensor_->publish_state(0.0f);
   }
 
   float current = 0.0f;

esphome/components/cse7766/cse7766.h

@@ -36,7 +36,6 @@ class CSE7766Component final : public Component, public uart::UARTDevice {
 
   uint8_t raw_data_[CSE7766_RAW_DATA_SIZE];
   uint8_t raw_data_index_{0};
-  uint16_t cf_pulses_last_{0};
   uint32_t last_transmission_{0};
   sensor::Sensor *voltage_sensor_{nullptr};
   sensor::Sensor *current_sensor_{nullptr};
@@ -46,8 +45,7 @@ class CSE7766Component final : public Component, public uart::UARTDevice {
   sensor::Sensor *reactive_power_sensor_{nullptr};
   sensor::Sensor *power_factor_sensor_{nullptr};
   uint32_t cf_pulses_total_{0};
-  // Power cycle of the last frame that carried a new power measurement, 0 if none
-  uint32_t last_power_cycle_{0};
+  uint16_t cf_pulses_last_{0};
 };
 
 }  // namespace esphome::cse7766

esphome/components/cst816/touchscreen/cst816_touchscreen.h

@@ -8,7 +8,7 @@
 
 namespace esphome::cst816 {
 
-ESPHOME_LOG_TAG(TAG, "cst816.touchscreen");
+static const char *const TAG = "cst816.touchscreen";
 
 static const uint8_t REG_STATUS = 0x00;
 static const uint8_t REG_TOUCH_NUM = 0x02;

esphome/components/cst9220/touchscreen/cst9220_touchscreen.h

@@ -8,7 +8,7 @@
 
 namespace esphome::cst9220 {
 
-ESPHOME_LOG_TAG(TAG, "cst9220.touchscreen");
+static const char *const TAG = "cst9220.touchscreen";
 
 // The CST92xx family uses 16-bit (big-endian) register addresses.
 static const uint16_t REG_TOUCH_DATA = 0xD000;  // touch report

esphome/components/deep_sleep/__init__.py

@@ -143,8 +143,6 @@ def validate_wakeup_pin(
         processed_pins: list[ConfigType] = [{CONF_PIN: value}]
     else:
         processed_pins = list(value)
-        if not processed_pins:
-            raise cv.Invalid("'wakeup_pin' needs at least one entry")
 
     for i, pin_config in enumerate(processed_pins):
         # now validate each item
@@ -156,34 +154,29 @@ def validate_wakeup_pin(
 
 
 def validate_config(config: ConfigType) -> ConfigType:
-    wakeup_pins = config.get(CONF_WAKEUP_PIN)
-    has_pin_mode = CONF_WAKEUP_PIN_MODE in config
-    if has_pin_mode and wakeup_pins is None:
+    # right now only BK72XX supports the list format for wakeup pins
+    if CORE.is_bk72xx:
+        if CONF_WAKEUP_PIN_MODE in config:
+            wakeup_pins = config.get(CONF_WAKEUP_PIN, [])
+            if len(wakeup_pins) > 1:
+                raise cv.Invalid(
+                    "You need to remove the global wakeup_pin_mode and define it per pin"
+                )
+            if wakeup_pins:
+                if CONF_WAKEUP_PIN_MODE in wakeup_pins[0]:
+                    raise cv.Invalid(
+                        "Specify wakeup_pin_mode either at the top level under deep_sleep "
+                        "or under the pin entry, not both"
+                    )
+                wakeup_pins[0][CONF_WAKEUP_PIN_MODE] = config.pop(CONF_WAKEUP_PIN_MODE)
+    elif (
+        isinstance(config.get(CONF_WAKEUP_PIN), list)
+        and len(config[CONF_WAKEUP_PIN]) > 1
+    ):
         raise cv.Invalid(
-            "'wakeup_pin_mode' requires 'wakeup_pin'", path=[CONF_WAKEUP_PIN_MODE]
+            "Your platform does not support providing multiple entries in wakeup_pin"
         )
-    multiple_pins = wakeup_pins is not None and len(wakeup_pins) > 1
-    # wakeup_pin is limited to ESP32 and BK72XX, and only BK72XX accepts a list
-    if not CORE.is_bk72xx:
-        if multiple_pins:
-            raise cv.Invalid(
-                "ESP32 does not support multiple entries for 'wakeup_pin'",
-                path=[CONF_WAKEUP_PIN],
-            )
-    elif has_pin_mode:
-        if multiple_pins:
-            raise cv.Invalid(
-                "Remove the global 'wakeup_pin_mode' and define it per pin",
-                path=[CONF_WAKEUP_PIN_MODE],
-            )
-        if CONF_WAKEUP_PIN_MODE in (pin := wakeup_pins[0]):
-            raise cv.Invalid(
-                "Specify 'wakeup_pin_mode' either at the top level under 'deep_sleep' "
-                "or under the pin entry, not both",
-                path=[CONF_WAKEUP_PIN, 0, CONF_WAKEUP_PIN_MODE],
-            )
-        # Move the global mode into the single pin entry, which to_code() reads
-        pin[CONF_WAKEUP_PIN_MODE] = config.pop(CONF_WAKEUP_PIN_MODE)
+
     return config
 
 
@@ -210,11 +203,11 @@ def _validate_sleep_duration(value: core.TimePeriod) -> core.TimePeriod:
     if CORE.is_bk72xx:
         max_duration = core.TimePeriod(hours=36)
         if value > max_duration:
-            raise cv.Invalid("'sleep_duration' cannot be more than 36 hours on BK72XX")
+            raise cv.Invalid("sleep duration cannot be more than 36 hours on BK72XX")
     elif CORE.using_zephyr:
         max_duration = core.TimePeriod(days=49)
         if value > max_duration:
-            raise cv.Invalid("'sleep_duration' cannot be more than 49 days on Zephyr")
+            raise cv.Invalid("sleep duration cannot be more than 49 days on Zephyr")
     return value
 
 
@@ -297,10 +290,7 @@ CONFIG_SCHEMA = cv.All(
                 cv.positive_time_period_milliseconds,
                 _validate_sleep_duration,
             ),
-            cv.Optional(CONF_WAKEUP_PIN): cv.All(
-                cv.only_on([PLATFORM_ESP32, PLATFORM_BK72XX]),
-                validate_wakeup_pin,
-            ),
+            cv.Optional(CONF_WAKEUP_PIN): validate_wakeup_pin,
             cv.Optional(CONF_WAKEUP_PIN_MODE): cv.All(
                 cv.only_on([PLATFORM_ESP32, PLATFORM_BK72XX]),
                 cv.enum(WAKEUP_PIN_MODES, upper=True),
@@ -357,10 +347,11 @@ async def to_code(config: ConfigType) -> None:
 
     if CONF_SLEEP_DURATION in config:
         cg.add(var.set_sleep_duration(config[CONF_SLEEP_DURATION]))
-    if (wakeup_pins := config.get(CONF_WAKEUP_PIN)) is not None:
+    if CONF_WAKEUP_PIN in config:
+        pins_as_list = config.get(CONF_WAKEUP_PIN, [])
         if CORE.is_bk72xx:
-            cg.add(var.init_wakeup_pins(len(wakeup_pins)))
-            for item in wakeup_pins:
+            cg.add(var.init_wakeup_pins(len(pins_as_list)))
+            for item in pins_as_list:
                 cg.add(
                     var.add_wakeup_pin(
                         await cg.gpio_pin_expression(item[CONF_PIN]),
@@ -370,7 +361,7 @@ async def to_code(config: ConfigType) -> None:
                     )
                 )
         else:
-            pin = await cg.gpio_pin_expression(wakeup_pins[0][CONF_PIN])
+            pin = await cg.gpio_pin_expression(pins_as_list[0][CONF_PIN])
             cg.add(var.set_wakeup_pin(pin))
     if CONF_WAKEUP_PIN_MODE in config:
         cg.add(var.set_wakeup_pin_mode(config[CONF_WAKEUP_PIN_MODE]))

esphome/components/display/__init__.py

@@ -250,42 +250,6 @@ def add_metadata(
     )
 
 
-KEY_EXTERNAL_WRITERS = "external_writers"
-
-
-def _get_external_writer_list() -> list[tuple[ID, str]]:
-    """Get the raw external writer list. Each entry is (display id, owner)."""
-    return CORE.data.setdefault(DOMAIN, {}).setdefault(KEY_EXTERNAL_WRITERS, [])
-
-
-def register_external_writer(display_id: ID, owner: str) -> None:
-    """Declare that ``owner`` draws into the display from outside its lambda or pages.
-
-    Call from the owner's CONFIG_SCHEMA. The ID may still be unresolved; the ID pass
-    resolves it in place before final validation.
-    """
-    _get_external_writer_list().append((display_id, owner))
-
-
-def get_external_writers(display_id: ID) -> list[str]:
-    """Get the owners registered for a display. Only valid once IDs are resolved."""
-    return [
-        owner
-        for id_, owner in _get_external_writer_list()
-        if id_.id is not None and id_.id == display_id.id
-    ]
-
-
-def has_external_writer(display_id: ID) -> bool:
-    """Tell a driver's final validation that something else draws into the display.
-
-    LVGL anywhere in the config also counts, as the drivers assumed before.
-    """
-    from esphome.components.lvgl import DOMAIN as LVGL_DOMAIN
-
-    return LVGL_DOMAIN in full_config.get() or bool(get_external_writers(display_id))
-
-
 async def register_display(var, config):
     await cg.register_component(var, config)
     await setup_display_core_(var, config)

esphome/components/display/display.cpp

@@ -5,7 +5,6 @@
 #include "display_color_utils.h"
 #include "esphome/core/application.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 
 namespace esphome::display {
@@ -53,62 +52,37 @@ void Display::line_at_angle(int x, int y, int angle, int start_radius, int stop_
   this->line(x1, y1, x2, y2, color);
 }
 
-// flatten keeps to_color() inlined in the pixel loop; in PSRAM builds GCC at
-// -Os stops inlining it once there are two call sites, which costs a call and
-// spills per pixel. Without PSRAM there is one call site and it changes
-// nothing, and draw_pixel_at() stays a virtual call either way.
-template<ColorBitness BITNESS>
-static void __attribute__((flatten))
-draw_packed_pixels(Display *display, int x_start, int y_start, int w, int h, const uint8_t *ptr, ColorOrder order,
-                   bool big_endian, int x_offset, int y_offset, int x_pad) {
-  const size_t line_stride = x_offset + w + x_pad;  // length of each source line in pixels
-  // BITNESS is a constant here, so to_color()'s three per pixel divisions
-  // become a multiply and shift and its bitness switch folds.
-  const auto draw_source_pixel = [&](int x, int y, size_t source_idx) ESPHOME_ALWAYS_INLINE {
-    display->draw_pixel_at(
-        x + x_start, y + y_start,
-        ColorUtil::to_color(ColorUtil::read_packed<BITNESS>(ptr, source_idx, big_endian), order, BITNESS));
-  };
-  // The source and frame buffers are row-major, so walking rows keeps the read
-  // and the write sequential. When the display swaps the axes before writing,
-  // walking columns keeps the write sequential instead; with the frame buffer
-  // in PSRAM a strided write costs more than a strided read.
-#ifdef USE_PSRAM
-  if (display->pixel_axes_swapped()) {
-    size_t column_idx = y_offset * line_stride + x_offset;
-    for (int x = 0; x != w; x++, column_idx++) {
-      size_t source_idx = column_idx;
-      for (int y = 0; y != h; y++, source_idx += line_stride) {
-        draw_source_pixel(x, y, source_idx);
-      }
-    }
-    return;
-  }
-#endif
-  // Row walk: builds without PSRAM, and PSRAM builds whose axes are not swapped.
-  for (int y = 0; y != h; y++) {
-    size_t source_idx = (y_offset + y) * line_stride + x_offset;
-    for (int x = 0; x != w; x++, source_idx++) {
-      draw_source_pixel(x, y, source_idx);
-    }
-  }
-}
-
 void Display::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, ColorOrder order,
                              ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) {
-  switch (bitness) {
-    case COLOR_BITNESS_565:
-      draw_packed_pixels<COLOR_BITNESS_565>(this, x_start, y_start, w, h, ptr, order, big_endian, x_offset, y_offset,
-                                            x_pad);
-      break;
-    case COLOR_BITNESS_888:
-      draw_packed_pixels<COLOR_BITNESS_888>(this, x_start, y_start, w, h, ptr, order, big_endian, x_offset, y_offset,
-                                            x_pad);
-      break;
-    default:
-      draw_packed_pixels<COLOR_BITNESS_332>(this, x_start, y_start, w, h, ptr, order, big_endian, x_offset, y_offset,
-                                            x_pad);
-      break;
+  size_t line_stride = x_offset + w + x_pad;  // length of each source line in pixels
+  uint32_t color_value;
+  for (int y = 0; y != h; y++) {
+    size_t source_idx = (y_offset + y) * line_stride + x_offset;
+    size_t source_idx_mod;
+    for (int x = 0; x != w; x++, source_idx++) {
+      switch (bitness) {
+        default:
+          color_value = ptr[source_idx];
+          break;
+        case COLOR_BITNESS_565:
+          source_idx_mod = source_idx * 2;
+          if (big_endian) {
+            color_value = (ptr[source_idx_mod] << 8) + ptr[source_idx_mod + 1];
+          } else {
+            color_value = ptr[source_idx_mod] + (ptr[source_idx_mod + 1] << 8);
+          }
+          break;
+        case COLOR_BITNESS_888:
+          source_idx_mod = source_idx * 3;
+          if (big_endian) {
+            color_value = (ptr[source_idx_mod + 0] << 16) + (ptr[source_idx_mod + 1] << 8) + ptr[source_idx_mod + 2];
+          } else {
+            color_value = ptr[source_idx_mod + 0] + (ptr[source_idx_mod + 1] << 8) + (ptr[source_idx_mod + 2] << 16);
+          }
+          break;
+      }
+      this->draw_pixel_at(x + x_start, y + y_start, ColorUtil::to_color(color_value, order, bitness));
+    }
   }
 }
 

esphome/components/display/display.h

@@ -139,11 +139,6 @@ enum DisplayRotation {
   DISPLAY_ROTATION_270_DEGREES = 270,
 };
 
-/// Whether a rotation swaps the x and y axes.
-constexpr bool rotation_swaps_axes(DisplayRotation rotation) {
-  return rotation == DISPLAY_ROTATION_90_DEGREES || rotation == DISPLAY_ROTATION_270_DEGREES;
-}
-
 const int EDGES_TRIGON = 3;
 const int EDGES_TRIANGLE = 3;
 const int EDGES_TETRAGON = 4;
@@ -722,12 +717,6 @@ class Display : public PollingComponent {
 
   virtual DisplayRotation get_rotation() const { return this->rotation_; }
 
-  /// True when draw_pixel_at() swaps x and y before writing, so pixels that are
-  /// neighbours along x land a row apart in the frame buffer. Not the same as
-  /// get_width()/get_height() swapping: a display that rotates in hardware
-  /// reports swapped dimensions but writes unswapped pixels.
-  virtual bool pixel_axes_swapped() const { return rotation_swaps_axes(this->rotation_); }
-
   /** Get the type of display that the buffer corresponds to. In case of dynamically configurable displays,
    * returns the type the display is currently configured to.
    */

esphome/components/display/display_color_utils.h

@@ -1,8 +1,5 @@
 #pragma once
-#include <array>
-#include <cstdint>
 #include "esphome/core/color.h"
-#include "esphome/core/helpers.h"
 
 namespace esphome::display {
 enum ColorOrder : uint8_t { COLOR_ORDER_RGB = 0, COLOR_ORDER_BGR = 1, COLOR_ORDER_GRB = 2 };
@@ -11,27 +8,6 @@ inline static uint8_t esp_scale(uint8_t i, uint8_t scale, uint8_t max_value = 25
 
 class ColorUtil {
  public:
-  /// Reads one packed pixel of the given bitness from a source buffer into the
-  /// value to_color() takes. BITNESS is a template argument so the byte layout
-  /// folds; pass it on to to_color() as a constant too, and its channel scaling
-  /// divides by a constant, which the compiler turns into a multiply and shift.
-  template<ColorBitness BITNESS>
-  static ESPHOME_ALWAYS_INLINE uint32_t read_packed(const uint8_t *ptr, size_t index, bool big_endian) {
-    if constexpr (BITNESS == COLOR_BITNESS_565) {
-      const size_t idx = index * 2;
-      if (big_endian)
-        return (ptr[idx] << 8) + ptr[idx + 1];
-      return ptr[idx] + (ptr[idx + 1] << 8);
-    } else if constexpr (BITNESS == COLOR_BITNESS_888) {
-      const size_t idx = index * 3;
-      if (big_endian)
-        return (ptr[idx + 0] << 16) + (ptr[idx + 1] << 8) + ptr[idx + 2];
-      return ptr[idx + 0] + (ptr[idx + 1] << 8) + (ptr[idx + 2] << 16);
-    } else {
-      return ptr[index];
-    }
-  }
-
   static Color to_color(uint32_t colorcode, ColorOrder color_order,
                         ColorBitness color_bitness = ColorBitness::COLOR_BITNESS_888, bool right_bit_aligned = true) {
     uint8_t first_color, second_color, third_color;
@@ -178,54 +154,4 @@ class ColorUtil {
     return color;
   }
 };
-
-/** Rec.601 luma weights (0.299/0.587/0.114), scaled by 256 */
-static constexpr uint16_t REC601_LUMA_R = 77;
-static constexpr uint16_t REC601_LUMA_G = 150;
-static constexpr uint16_t REC601_LUMA_B = 29;
-
-/** Rec.601 luma of an RGB color, for optimum perceptual brightness */
-constexpr uint8_t rec601_luma(Color color) {
-  return (uint8_t) ((REC601_LUMA_R * color.r + REC601_LUMA_G * color.g + REC601_LUMA_B * color.b + 128u) >> 8);
-}
-
-/** Map an RGB color to a single monochrome bit: 1 = white, 0 = black */
-constexpr uint8_t color_to_mono(Color color) { return rec601_luma(color) >= 128 ? 1 : 0; }
-
-/** color_to_mono() of an RGB565 value as ColorUtil::to_color() reads it, from table lookups instead of a division
- * per channel.
- */
-class Rgb565ToMono {
- public:
-  explicit Rgb565ToMono(ColorOrder order) {
-    // Rec.601 weight of the 5-bit, 6-bit and 5-bit fields, by the channel each one holds in this order
-    uint16_t high = REC601_LUMA_R, middle = REC601_LUMA_G, low = REC601_LUMA_B;
-    if (order == COLOR_ORDER_BGR) {
-      high = REC601_LUMA_B;
-      low = REC601_LUMA_R;
-    } else if (order == COLOR_ORDER_GRB) {
-      high = REC601_LUMA_G;
-      middle = REC601_LUMA_R;
-    }
-    // Each field value scaled to 0..255, then weighted
-    for (unsigned i = 0; i != 32; i++) {
-      this->high_[i] = high * esp_scale(i, 31);
-      this->low_[i] = low * esp_scale(i, 31);
-    }
-    for (unsigned i = 0; i != 64; i++)
-      this->middle_[i] = middle * esp_scale(i, 63);
-  }
-
-  uint8_t operator()(uint16_t value) const {
-    const uint32_t weighted = this->high_[value >> 11] + this->middle_[(value >> 5) & 0x3F] + this->low_[value & 0x1F];
-    return ((weighted + 128u) >> 8) >= 128 ? 1 : 0;
-  }
-
- protected:
-  // Weighted contribution of each value of each field
-  std::array<uint16_t, 32> high_{};
-  std::array<uint16_t, 64> middle_{};
-  std::array<uint16_t, 32> low_{};
-};
-
 }  // namespace esphome::display

esphome/components/emontx/__init__.py

@@ -23,18 +23,11 @@ DEPENDENCIES = ["uart"]
 
 emontx_ns = cg.esphome_ns.namespace("emontx")
 EmonTx = emontx_ns.class_("EmonTx", cg.Component, uart.UARTDevice)
-LockOnReboot = emontx_ns.enum("LockOnReboot", is_class=True)
 
 CONF_EMONTX_ID = "emontx_id"
 CONF_TAG_NAME = "tag_name"
 CONF_ON_JSON = "on_json"
 CONF_LOCK_ON_REBOOT = "lock_on_reboot"
-LOCK_ON_REBOOT_AUTO = "auto"
-LOCK_ON_REBOOT_MODES = {
-    LOCK_ON_REBOOT_AUTO: LockOnReboot.LOCK_ON_REBOOT_AUTO,
-    True: LockOnReboot.LOCK_ON_REBOOT_ALWAYS,
-    False: LockOnReboot.LOCK_ON_REBOOT_NEVER,
-}
 
 DOMAIN = "emontx"
 
@@ -66,9 +59,7 @@ CONFIG_SCHEMA = (
             cv.GenerateID(): cv.declare_id(EmonTx),
             cv.Optional(CONF_ON_JSON): _synchronous_automation_schema(),
             cv.Optional(CONF_ON_DATA): _synchronous_automation_schema(),
-            cv.Optional(CONF_LOCK_ON_REBOOT, default=LOCK_ON_REBOOT_AUTO): cv.Any(
-                cv.boolean, cv.one_of(LOCK_ON_REBOOT_AUTO, lower=True)
-            ),
+            cv.Optional(CONF_LOCK_ON_REBOOT, default=False): cv.boolean,
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -144,11 +135,8 @@ async def to_code(config: ConfigType) -> None:
     await uart.register_uart_device(var, config)
     await automation.build_callback_automations(var, config, _CALLBACK_AUTOMATIONS)
 
-    lock = config[CONF_LOCK_ON_REBOOT]
-    cg.add(var.set_lock_on_reboot(LOCK_ON_REBOOT_MODES[lock]))
-    if lock == LOCK_ON_REBOOT_AUTO:
-        # Locking depends on the firmware version the emonTx reports
-        cg.add_define("USE_EMONTX_VERSION")
+    if config[CONF_LOCK_ON_REBOOT]:
+        cg.add(var.set_lock_on_reboot(True))
 
 
 # Action: emontx.send_command

esphome/components/emontx/emontx.cpp

@@ -1,91 +1,23 @@
 #include "emontx.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 #include "esphome/components/json/json_util.h"
 
 namespace esphome::emontx {
 
 ESPHOME_LOG_TAG(TAG, "emontx");
 
-static constexpr uint32_t UNLOCK_ID = 0;
-// The emonTx joins bytes received while a command is pending into that command, so the next one waits
-static constexpr uint32_t COMMAND_GAP_MS = 250;
-
-#ifdef USE_EMONTX_VERSION
-static constexpr uint32_t VERSION_REQUEST_ID = 1;
-// Without a reply, 'v' is sent again every VERSION_RETRY_FRAMES data lines, VERSION_MAX_ATTEMPTS times in all
-static constexpr uint8_t VERSION_RETRY_FRAMES = 2;
-static constexpr uint8_t VERSION_MAX_ATTEMPTS = 3;
-// Line of the 'v' reply (and of the boot banner) carrying the release, e.g. "  - Version:    v1.1.1"
-static const char VERSION_PREFIX[] PROGMEM = "  - Version:";
-// Every data line starts with the message counter, in JSON or text format
-static const char MSG_JSON_PREFIX[] PROGMEM = "{\"MSG\":";
-static const char MSG_TEXT_PREFIX[] PROGMEM = "MSG:";
-// First firmware with 'emonlock' and 'emonunlock'; older firmware takes them for the bootloader command
-static constexpr uint32_t LOCK_MIN_MAJOR = 1;
-static constexpr uint32_t LOCK_MIN_MINOR = 2;
-
-// True if line starts with the PROGMEM prefix and has more after it
-static bool starts_with(const char *line, size_t len, const char *prefix, size_t prefix_len) {
-  return len > prefix_len && ESPHOME_strncmp_P(line, prefix, prefix_len) == 0;
-}
-
-// Reads the decimal number (up to 9 digits) at pos and moves pos past it; false if there is none
-static bool read_number(const char *&pos, const char *end, uint32_t &value) {
-  const char *start = pos;
-  value = 0;
-  while (pos < end && pos - start < 9 && *pos >= '0' && *pos <= '9')
-    value = value * 10 + (*pos++ - '0');
-  return pos != start;
-}
-
-// True for a release such as "v1.2.0" or "v1.3.0-rc1" from LOCK_MIN_MAJOR.LOCK_MIN_MINOR on
-static bool supports_lock(const char *version, const char *end) {
-  if (version < end && (*version == 'v' || *version == 'V'))
-    version++;
-  uint32_t major;
-  if (!read_number(version, end, major) || version == end || *version != '.')
-    return false;
-  version++;
-  uint32_t minor;
-  if (!read_number(version, end, minor))
-    return false;
-  return major > LOCK_MIN_MAJOR || (major == LOCK_MIN_MAJOR && minor >= LOCK_MIN_MINOR);
-}
-#endif
-
 void EmonTx::setup() {
   this->buffer_pos_ = 0;
-  if (this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_ALWAYS) {
-    // The line feed ends any boot noise
-    this->write_byte('\n');
-    this->set_timeout(UNLOCK_ID, COMMAND_GAP_MS, [this]() {
-      this->unlock_();
-#ifdef USE_EMONTX_VERSION
-      if (this->wants_version_())
-        this->request_version_();
-#endif
-    });
+  if (!this->lock_on_reboot_)
     return;
-  }
-#ifdef USE_EMONTX_VERSION
-  // With AUTO, the reply decides whether to unlock
-  if (this->wants_version_())
-    this->request_version_();
-#endif
-}
-
-void EmonTx::unlock_() {
-  ESP_LOGI(TAG, "Unlocking emonTx");
+  // The line feed ends any boot noise first
+  ESP_LOGI(TAG, "Unlocking emonTx after boot");
+  this->write_byte('\n');
   this->send_command("emonunlock");
 }
 
 void EmonTx::on_shutdown() {
-  bool lock = this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_ALWAYS;
-#ifdef USE_EMONTX_VERSION
-  lock |= this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_AUTO && this->lock_supported_;
-#endif
-  if (!lock)
+  if (!this->lock_on_reboot_)
     return;
   if (this->is_paused()) {
     ESP_LOGW(TAG, "Not locking emonTx before shutdown, UART is paused");
@@ -116,11 +48,6 @@ void EmonTx::loop() {
     uint8_t dropped;
     while (this->available() > 0 && this->read_byte(&dropped))
       this->discarding_line_ = dropped != '\n';
-#ifdef USE_EMONTX_VERSION
-    // The emonTx may have been flashed, or a request dropped, during the pause
-    if (this->wants_version_())
-      this->request_version_();
-#endif
   }
 
   // Read all available data to prevent UART buffer overflow
@@ -150,12 +77,6 @@ void EmonTx::loop() {
           ESP_LOGV(TAG, "Line is JSON, parsing...");
           this->parse_json_(this->buffer_.data(), len);
         }
-#ifdef USE_EMONTX_VERSION
-        if (this->wants_version_()) {
-          this->parse_msg_number_(this->buffer_.data(), len);
-          this->parse_version_line_(this->buffer_.data(), len);
-        }
-#endif
       }
     } else if (received == '\r' || this->discarding_line_) {
       // Ignore CR, and the rest of a line that overflowed or was interrupted by a pause
@@ -191,91 +112,12 @@ void EmonTx::parse_json_(const char *data, size_t len) {
   }
 }
 
-#ifdef USE_EMONTX_VERSION
-void EmonTx::request_version_() {
-  // The firmware may have changed; until the reply, an unknown version gets no lock commands
-  this->lock_supported_ = false;
-  this->version_frames_left_ = VERSION_RETRY_FRAMES * VERSION_MAX_ATTEMPTS;
-  this->send_version_request_();
-}
-
-// The line feed ends any pending input; the reply is picked up in loop() by parse_version_line_()
-void EmonTx::send_version_request_() {
-  if (this->is_paused())
-    return;
-  this->write_byte('\n');
-  this->set_timeout(VERSION_REQUEST_ID, COMMAND_GAP_MS, [this]() { this->send_command("v"); });
-}
-
-void EmonTx::parse_msg_number_(const char *line, size_t len) {
-  const char *pos;
-  if (starts_with(line, len, MSG_JSON_PREFIX, sizeof(MSG_JSON_PREFIX) - 1)) {
-    pos = line + sizeof(MSG_JSON_PREFIX) - 1;
-  } else if (starts_with(line, len, MSG_TEXT_PREFIX, sizeof(MSG_TEXT_PREFIX) - 1)) {
-    pos = line + sizeof(MSG_TEXT_PREFIX) - 1;
-  } else {
-    return;
-  }
-  uint32_t msg_number;
-  if (!read_number(pos, line + len, msg_number))
-    return;
-
-  // MSG restarts at 1 when the emonTx reboots, as it does after a firmware update
-  if (msg_number <= this->last_msg_number_) {
-    this->request_version_();
-  } else if (this->version_frames_left_ > 0) {
-    if (--this->version_frames_left_ == 0) {
-      ESP_LOGW(TAG, "No firmware version from the emonTx, it may still be locked");
-    } else if (this->version_frames_left_ % VERSION_RETRY_FRAMES == 0) {
-      this->send_version_request_();
-    }
-  }
-  this->last_msg_number_ = msg_number;
-}
-
-void EmonTx::parse_version_line_(const char *line, size_t len) {
-  constexpr size_t prefix_len = sizeof(VERSION_PREFIX) - 1;
-  if (!starts_with(line, len, VERSION_PREFIX, prefix_len))
-    return;
-  const char *version = line + prefix_len;
-  const char *end = line + len;
-  while (version < end && *version == ' ')
-    version++;
-  if (version == end)
-    return;
-  ESP_LOGI(TAG, "emonTx firmware version: %.*s", static_cast<int>(end - version), version);
-  this->version_frames_left_ = 0;
-#ifdef USE_EMONTX_VERSION_TEXT_SENSOR
-  if (this->version_text_sensor_ != nullptr)
-    this->version_text_sensor_->publish_state(version, end - version);
-#endif
-
-  bool supported = supports_lock(version, end);
-  if (this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_AUTO && supported && !this->unlock_sent_) {
-    // Once the rest of the reply has gone out; a pause drops it, and the version request on resume retries
-    this->set_timeout(UNLOCK_ID, COMMAND_GAP_MS, [this]() {
-      if (this->is_paused())
-        return;
-      this->unlock_();
-      this->unlock_sent_ = true;
-    });
-  }
-  this->lock_supported_ = supported;
-}
-#endif
-
 /**
  * @brief Logs the EmonTx component configuration details.
  */
 void EmonTx::dump_config() {
   ESP_LOGCONFIG(TAG, "EmonTx:");
-  const char *lock = LOG_STR_LITERAL("no");
-  if (this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_ALWAYS) {
-    lock = LOG_STR_LITERAL("yes");
-  } else if (this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_AUTO) {
-    lock = LOG_STR_LITERAL("auto");
-  }
-  ESP_LOGCONFIG(TAG, "  Lock on reboot: %s", lock);
+  ESP_LOGCONFIG(TAG, "  Lock on reboot: %s", YESNO(this->lock_on_reboot_));
 
 #ifdef USE_SENSOR
   ESP_LOGCONFIG(TAG, "  Registered sensors: %zu", this->sensors_.size());
@@ -285,9 +127,6 @@ void EmonTx::dump_config() {
 #else
   ESP_LOGCONFIG(TAG, "  Sensor support: DISABLED");
 #endif
-#ifdef USE_EMONTX_VERSION_TEXT_SENSOR
-  LOG_TEXT_SENSOR("  ", "Firmware version", this->version_text_sensor_);
-#endif
 }
 
 /**

esphome/components/emontx/emontx.h

@@ -13,21 +13,12 @@
 #ifdef USE_SENSOR
 #include "esphome/components/sensor/sensor.h"
 #endif
-#ifdef USE_EMONTX_VERSION_TEXT_SENSOR
-#include "esphome/components/text_sensor/text_sensor.h"
-#endif
 
 namespace esphome::emontx {
 
 /// Maximum line length in bytes (plus one byte reserved for null terminator)
 static constexpr size_t MAX_LINE_LENGTH = 1024;
 
-enum class LockOnReboot : uint8_t {
-  LOCK_ON_REBOOT_NEVER,
-  LOCK_ON_REBOOT_ALWAYS,
-  LOCK_ON_REBOOT_AUTO,  // Only when the emonTx reports firmware v1.2.0 or later
-};
-
 /**
  * @class EmonTx
  * @brief Main class for the EmonTx component.
@@ -36,9 +27,6 @@ enum class LockOnReboot : uint8_t {
  * extracts tags and values, and publishes them to registered sensors.
  */
 class EmonTx final : public Component, public uart::UARTDevice {
-#ifdef USE_EMONTX_VERSION_TEXT_SENSOR
-  SUB_TEXT_SENSOR(version)
-#endif
  public:
   EmonTx() = default;
 
@@ -62,8 +50,8 @@ class EmonTx final : public Component, public uart::UARTDevice {
   bool is_paused() const { return this->paused_.load(std::memory_order_relaxed); }
 
   /// Lock the emonTx ('emonlock') before a reboot, so serial garbage during the reboot is not taken
-  /// as a command, and unlock it after boot. Needs emonTx firmware v1.2.0 or later, which AUTO checks.
-  void set_lock_on_reboot(LockOnReboot lock_on_reboot) { this->lock_on_reboot_ = lock_on_reboot; }
+  /// as a command, and unlock it in setup(). Needs emonTx firmware v1.2.0 or later.
+  void set_lock_on_reboot(bool lock_on_reboot) { this->lock_on_reboot_ = lock_on_reboot; }
 
 #ifdef USE_SENSOR
   void init_sensors(size_t count) { this->sensors_.init(count); }
@@ -72,20 +60,6 @@ class EmonTx final : public Component, public uart::UARTDevice {
 
  protected:
   void parse_json_(const char *data, size_t len);
-  void unlock_();
-#ifdef USE_EMONTX_VERSION
-  bool wants_version_() const {
-#ifdef USE_EMONTX_VERSION_TEXT_SENSOR
-    if (this->version_text_sensor_ != nullptr)
-      return true;
-#endif
-    return this->lock_on_reboot_ == LockOnReboot::LOCK_ON_REBOOT_AUTO;
-  }
-  void request_version_();
-  void send_version_request_();
-  void parse_msg_number_(const char *line, size_t len);
-  void parse_version_line_(const char *line, size_t len);
-#endif
 
 #ifdef USE_SENSOR
   FixedVector<std::pair<const char *, sensor::Sensor *>> sensors_{};
@@ -95,14 +69,8 @@ class EmonTx final : public Component, public uart::UARTDevice {
   uint16_t buffer_pos_{0};
   std::atomic<bool> paused_{false};
   bool was_paused_{false};
-  LockOnReboot lock_on_reboot_{LockOnReboot::LOCK_ON_REBOOT_NEVER};
+  bool lock_on_reboot_{false};
   bool discarding_line_{false};  // Set after an overflow or a pause until the end of that line
-#ifdef USE_EMONTX_VERSION
-  bool lock_supported_{false};      // The last version reported is v1.2.0 or later
-  bool unlock_sent_{false};         // AUTO has sent 'emonunlock' since boot
-  uint8_t version_frames_left_{0};  // Data lines still to wait for a version reply; 0 when none is owed
-  uint32_t last_msg_number_{0};
-#endif
   std::array<char, MAX_LINE_LENGTH + 1> buffer_{};
 };
 

esphome/components/emontx/text_sensor/__init__.py

@@ -1,24 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import text_sensor
-import esphome.config_validation as cv
-from esphome.const import CONF_VERSION, ENTITY_CATEGORY_DIAGNOSTIC, ICON_CHIP
-from esphome.types import ConfigType
-
-from .. import CONF_EMONTX_ID, EmonTx
-
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_EMONTX_ID): cv.use_id(EmonTx),
-        cv.Optional(CONF_VERSION): text_sensor.text_sensor_schema(
-            entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_CHIP
-        ),
-    }
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    hub = await cg.get_variable(config[CONF_EMONTX_ID])
-    text_sensors = text_sensor.sub_text_sensors(config)
-    if await text_sensors(CONF_VERSION, hub.set_version_text_sensor) is not None:
-        cg.add_define("USE_EMONTX_VERSION")
-        cg.add_define("USE_EMONTX_VERSION_TEXT_SENSOR")

esphome/components/epaper_spi/colorconv.h

@@ -2,7 +2,6 @@
 
 #include <cstdint>
 #include <algorithm>
-#include "esphome/components/display/display_color_utils.h"
 #include "esphome/core/color.h"
 
 /* Utility for converting internal \a Color RGB representation to supported IC hardware color keys
@@ -14,15 +13,21 @@
 
 namespace esphome::epaper_spi {
 
-// The Rec.601 luma helpers and the RGB565 mono lookup live in the shared display utilities, so other
-// drivers (e.g. it8951 in its 1 bit per pixel mode) can use them too.
-using display::color_to_mono;
-using display::rec601_luma;
-using display::Rgb565ToMono;
-
 /** Delta for when to regard as gray */
 static constexpr uint8_t COLORCONV_GRAY_THRESHOLD = 50;
 
+/** Rec.601 luma (0.299/0.587/0.114 weights, scaled by 256) for optimum perceptual brightness */
+constexpr uint8_t rec601_luma(Color color) {
+  return (uint8_t) ((77u * color.r + 150u * color.g + 29u * color.b + 128u) >> 8);
+}
+
+/** Map RGB color to a single monochrome bit
+ *
+ * @param color RGB color to convert from
+ * @return      1 = white, 0 = black
+ */
+constexpr uint8_t color_to_mono(Color color) { return rec601_luma(color) >= 128 ? 1 : 0; }
+
 /** Map RGB color to one of 4 discrete gray levels (2 bits per pixel)
  *
  * @param color RGB color to convert from

esphome/components/epaper_spi/display.py

@@ -40,6 +40,7 @@ from esphome.const import (
     CONF_WIDTH,
 )
 from esphome.cpp_generator import RawExpression
+from esphome.final_validate import full_config
 
 from . import models
 
@@ -197,11 +198,15 @@ def _final_validate(config) -> None:
         "epaper_spi", require_miso=False, require_mosi=True
     )(config)
 
+    global_config = full_config.get()
+    from esphome.components.lvgl import DOMAIN as LVGL_DOMAIN
+
     if CONF_LAMBDA not in config and CONF_PAGES not in config:
-        if display.has_external_writer(config[CONF_ID]):
+        if LVGL_DOMAIN in global_config:
             if CONF_UPDATE_INTERVAL not in config:
                 config[CONF_UPDATE_INTERVAL] = update_interval("never")
         else:
+            # If no drawing methods are configured, and LVGL is not enabled, show a test card
             config[CONF_SHOW_TEST_CARD] = True
     elif CONF_UPDATE_INTERVAL not in config:
         config[CONF_UPDATE_INTERVAL] = update_interval("1min")

esphome/components/epaper_spi/epaper_spi.cpp

@@ -131,7 +131,9 @@ void EPaperBase::update() {
 }
 
 void EPaperBase::wait_for_idle_(bool should_wait) {
+#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
   this->waiting_for_idle_start_ = millis();
+#endif
   this->waiting_for_idle_ = should_wait;
 }
 
@@ -154,10 +156,6 @@ void EPaperBase::loop() {
       ESP_LOGV(TAG, "Screen was busy for %u ms", (unsigned) (millis() - this->waiting_for_idle_start_));
 #endif
     } else {
-      if (now - this->waiting_for_idle_start_ > this->busy_timeout_seconds_ * 1000u) {
-        this->abandon_update_();
-        return;
-      }
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
       if (now - this->waiting_for_idle_last_print_ >= 1000) {
         ESP_LOGV(TAG, "Waiting for idle in state %s", this->epaper_state_to_string_());
@@ -170,20 +168,6 @@ void EPaperBase::loop() {
   this->process_state_();
 }
 
-// The busy pin never cleared: give up on this update so later ones are not refused, and make the next one full
-void EPaperBase::abandon_update_() {
-  ESP_LOGE(TAG, "Display stayed busy for %u s in state %s; check the busy pin", (unsigned) this->busy_timeout_seconds_,
-           this->epaper_state_to_string_());
-  this->status_set_warning(LOG_STR("Busy pin timeout"));
-  if (this->state_ == EPaperState::TRANSFER_DATA)
-    this->abort_transfer();
-  // Leave the panel powered down rather than with its high-voltage drivers enabled
-  this->power_off();
-  this->full_update_requested_ = true;
-  this->current_data_index_ = 0;
-  this->set_state_(EPaperState::IDLE);
-}
-
 /**
  * Process the state machine.
  * Typical state sequence:
@@ -258,7 +242,6 @@ void EPaperBase::process_state_() {
       break;
     case EPaperState::DEEP_SLEEP:
       this->deep_sleep();
-      this->status_clear_warning();
       this->set_state_(EPaperState::IDLE);
       ESP_LOGD(TAG, "Display update took %" PRIu32 " ms", millis() - this->update_start_time_);
       break;
@@ -362,120 +345,6 @@ void HOT EPaperBase::draw_pixel_at(int x, int y, Color color) {
   }
 }
 
-namespace {
-// One source row of an RGB565 block, written into a contiguous 1 bit per pixel buffer. Without SwapAxes the row lies
-// along a buffer row and the bit moves by step; with it the row lies along a bit column and the byte moves by step
-// rows.
-template<bool SwapAxes, bool BigEndianSource>
-void HOT write_rgb565_row(uint8_t *byte, uint8_t mask, int step, size_t row_width, const uint8_t *source, int count,
-                          const Rgb565ToMono &to_mono) {
-  const ptrdiff_t byte_step = SwapAxes ? step * static_cast<ptrdiff_t>(row_width) : 0;
-  for (; count != 0; count--, source += 2) {
-    const uint16_t value = BigEndianSource ? (source[0] << 8) | source[1] : source[0] | (source[1] << 8);
-    if (to_mono(value)) {
-      *byte |= mask;
-    } else {
-      *byte &= ~mask;
-    }
-    if constexpr (SwapAxes) {
-      byte += byte_step;
-    } else if (step > 0) {
-      mask >>= 1;
-      if (mask == 0) {
-        mask = 0x80;
-        byte++;
-      }
-    } else {
-      mask <<= 1;
-      if (mask == 0) {
-        mask = 0x01;
-        byte--;
-      }
-    }
-  }
-}
-}  // namespace
-
-// Each source column maps to one buffer coordinate and each source row to the other, each moving by 1 per pixel, so
-// the visible part of a block and its dirty area are worked out once for the whole block.
-void HOT EPaperBase::draw_rgb565_block_(uint8_t *buffer, int x_start, int y_start, int w, int h, const uint8_t *ptr,
-                                        ColorOrder order, bool big_endian, int x_offset, int y_offset, int x_pad) {
-  const bool swap = this->effective_transform_ & SWAP_XY;
-  const bool mirror_x = this->effective_transform_ & MIRROR_X;
-  const bool mirror_y = this->effective_transform_ & MIRROR_Y;
-  // The buffer axis a source column moves along, and the one a source row moves along
-  const int column_limit = swap ? this->height_ : this->width_;
-  const int row_limit = swap ? this->width_ : this->height_;
-  const bool column_mirrored = swap ? mirror_y : mirror_x;
-  const bool row_mirrored = swap ? mirror_x : mirror_y;
-  const int first_column = std::max(0, -x_start);
-  const int end_column = std::min(w, column_limit - x_start);
-  const int first_row = std::max(0, -y_start);
-  const int end_row = std::min(h, row_limit - y_start);
-  if (first_column >= end_column || first_row >= end_row)
-    return;
-  auto column_to_buffer = [&](int column) {
-    const int u = x_start + column;
-    return column_mirrored ? column_limit - 1 - u : u;
-  };
-  auto row_to_buffer = [&](int row) {
-    const int v = y_start + row;
-    return row_mirrored ? row_limit - 1 - v : v;
-  };
-
-  const int column_low = std::min(column_to_buffer(first_column), column_to_buffer(end_column - 1));
-  const int row_low = std::min(row_to_buffer(first_row), row_to_buffer(end_row - 1));
-  const int columns = end_column - first_column;
-  const int rows = end_row - first_row;
-  const int x_low = swap ? row_low : column_low;
-  const int y_low = swap ? column_low : row_low;
-  const int x_high = x_low + (swap ? rows : columns);
-  const int y_high = y_low + (swap ? columns : rows);
-
-  const Rgb565ToMono to_mono(order);
-  const size_t line_stride = x_offset + w + x_pad;
-  const size_t row_width = this->row_width_;
-  const int step = column_mirrored ? -1 : 1;
-  for (int row = first_row; row != end_row; row++) {
-    const uint8_t *source = ptr + ((y_offset + row) * line_stride + x_offset + first_column) * 2;
-    const int along = column_to_buffer(first_column);
-    const int across = row_to_buffer(row);
-    const int x = swap ? across : along;
-    const int y = swap ? along : across;
-    uint8_t *byte = buffer + y * row_width + x / 8;
-    const uint8_t mask = 0x80u >> (x % 8);
-    if (swap) {
-      if (big_endian) {
-        write_rgb565_row<true, true>(byte, mask, step, row_width, source, columns, to_mono);
-      } else {
-        write_rgb565_row<true, false>(byte, mask, step, row_width, source, columns, to_mono);
-      }
-    } else if (big_endian) {
-      write_rgb565_row<false, true>(byte, mask, step, row_width, source, columns, to_mono);
-    } else {
-      write_rgb565_row<false, false>(byte, mask, step, row_width, source, columns, to_mono);
-    }
-  }
-  this->x_low_ = clamp_at_most(this->x_low_, x_low);
-  this->x_high_ = clamp_at_least(this->x_high_, x_high);
-  this->y_low_ = clamp_at_most(this->y_low_, y_low);
-  this->y_high_ = clamp_at_least(this->y_high_, y_high);
-}
-
-// Writes an RGB565 block of pixels, as LVGL sends them, straight into a 1 bit per pixel buffer that is one block (the
-// usual case): the same result as draw_pixel_at() for each pixel. Anything else goes through draw_pixel_at().
-void HOT EPaperBase::draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, ColorOrder order,
-                                    ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) {
-  size_t contiguous_length;
-  uint8_t *contiguous = this->buffer_.get_span(0, contiguous_length);
-  if (!this->buffer_is_mono() || this->get_clipping().is_set() || bitness != COLOR_BITNESS_565 ||
-      contiguous_length != this->buffer_length_) {
-    Display::draw_pixels_at(x_start, y_start, w, h, ptr, order, bitness, big_endian, x_offset, y_offset, x_pad);
-    return;
-  }
-  this->draw_rgb565_block_(contiguous, x_start, y_start, w, h, ptr, order, big_endian, x_offset, y_offset, x_pad);
-}
-
 void EPaperBase::dump_config() {
   LOG_DISPLAY("", "E-Paper SPI", this);
   ESP_LOGCONFIG(TAG,

esphome/components/epaper_spi/epaper_spi.h

@@ -106,10 +106,7 @@ class EPaperBase : public Display,
 
   int get_width() override { return this->effective_transform_ & SWAP_XY ? this->height_ : this->width_; }
   int get_height() override { return this->effective_transform_ & SWAP_XY ? this->width_ : this->height_; }
-  bool pixel_axes_swapped() const override { return this->effective_transform_ & SWAP_XY; }
   void draw_pixel_at(int x, int y, Color color) override;
-  void draw_pixels_at(int x_start, int y_start, int w, int h, const uint8_t *ptr, ColorOrder order,
-                      ColorBitness bitness, bool big_endian, int x_offset, int y_offset, int x_pad) override;
   // Make the next update a full one. Applied when that update starts, so one in progress is not affected.
   void request_full_update() { this->full_update_requested_ = true; }
   // True from the start of an update until the display has refreshed and gone back to sleep.
@@ -128,14 +125,9 @@ class EPaperBase : public Display,
   virtual bool initialise(bool partial);
   void send_init_sequence_(const uint8_t *sequence, size_t length);
   void wait_for_idle_(bool should_wait);
-  void abandon_update_();
   bool init_buffer_(size_t buffer_length);
   void update_effective_transform_();
   bool rotate_coordinates_(int &x, int &y);
-  void draw_rgb565_block_(uint8_t *buffer, int x_start, int y_start, int w, int h, const uint8_t *ptr, ColorOrder order,
-                          bool big_endian, int x_offset, int y_offset, int x_pad);
-  // Whether the buffer holds 1 bit per pixel as draw_pixel_at() writes it, so draw_pixels_at() can write it directly
-  virtual bool buffer_is_mono() const { return false; }
 
   /**
    * Methods that must be implemented by concrete classes to control the display
@@ -145,8 +137,6 @@ class EPaperBase : public Display,
    * @return true if done, false if it should be called next loop
    */
   virtual bool transfer_data() = 0;
-  // Called when an update is abandoned in the middle of transfer_data(), to release anything it left open
-  virtual void abort_transfer() {}
   /**
    * Refresh the screen after data transfer
    */
@@ -197,20 +187,18 @@ class EPaperBase : public Display,
   // point to the pixel past the last one updated, i.e. may range up to width/height.
   uint16_t x_low_{}, y_low_{}, x_high_{}, y_high_{};
 
-  uint32_t waiting_for_idle_start_{};
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
   uint32_t waiting_for_idle_last_print_{};
+  uint32_t waiting_for_idle_start_{};
 #endif
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
   uint32_t update_start_time_{};
 #endif
 
   // properties with specific initialisers go last
-  uint32_t reset_duration_{10};
-  // Longer than any panel takes to refresh; past it the busy pin is assumed stuck
-  uint16_t busy_timeout_seconds_{120};
-  uint8_t full_update_every_{1};
   EPaperState state_{EPaperState::IDLE};
+  uint32_t reset_duration_{10};
+  uint8_t full_update_every_{1};
 };
 
 }  // namespace esphome::epaper_spi

esphome/components/epaper_spi/epaper_spi_mono.h

@@ -15,7 +15,6 @@ class EPaperMono : public EPaperBase {
   }
 
  protected:
-  bool buffer_is_mono() const override { return true; }
   void refresh_screen(bool partial) override;
   void power_on() override {}
   void power_off() override{};

esphome/components/epaper_spi/epaper_spi_ssd1677.cpp

@@ -58,9 +58,7 @@ bool HOT EPaperSSD1677::transfer_data() {
   // A full update ignores 0x26, and the copy may not hold a real frame yet (first update after
   // boot): send the new frame to both planes.
   const bool send_copy = this->plane_ == 0 && this->update_count_ != 0;
-  // A mono buffer already holds the frame as a RAM plane does, so it can be sent as it is; a deeper
-  // buffer (the four-level model) returns false and packs the plane in plane_row().
-  const bool direct = send_copy || this->buffer_is_mono();
+  const bool direct = send_copy || this->buffer_is_plane();
   const auto &source = send_copy ? this->sent_ : this->buffer_;
   const size_t row_length = this->plane_row_length_();
   const size_t plane_length = row_length * this->height_;

esphome/components/epaper_spi/epaper_spi_ssd1677.h

@@ -34,6 +34,9 @@ class EPaperSSD1677 : public EPaperMono {
   void init_comparison_frame_();
   // Bytes in one row of a RAM plane: 8 pixels per byte, whatever the buffer holds.
   size_t plane_row_length_() const { return (this->width_ + 7) / 8; }
+  // Whether the buffer already holds the frame as a RAM plane does, so it can be sent as it is.
+  // A subclass with a deeper buffer returns false and overrides plane_row().
+  virtual bool buffer_is_plane() const { return true; }
   // Row y of the frame as a RAM plane holds it, 1 bit per pixel with 1 = white.
   virtual void plane_row(size_t y, uint8_t *out);
   bool reset() override;

esphome/components/epaper_spi/epaper_spi_ssd1677_gray4.h

@@ -38,9 +38,9 @@ class EPaperSSD1677Gray4 : public EPaperSSD1677 {
   void draw_pixel_at(int x, int y, Color color) override;
 
  protected:
-  bool buffer_is_mono() const override { return false; }
   // A partial update if partial updates are enabled and this is not a full one.
   bool is_partial_push_() const { return this->update_count_ != 0 && this->sent_.is_valid(); }
+  bool buffer_is_plane() const override { return false; }
   void plane_row(size_t y, uint8_t *out) override;
   void refresh_screen(bool partial) override;
   bool transfer_data() override;

esphome/components/epaper_spi/epaper_spi_t133a01.cpp

@@ -364,15 +364,6 @@ bool HOT EPaperT133A01::transfer_data() {
   return true;
 }
 
-void EPaperT133A01::abort_transfer() {
-  // A data stream is open, with one of the chip selects held low, whenever transfer_data() has started sending rows
-  if (this->current_data_index_ == 0)
-    return;
-  this->disable();
-  this->cs_pin_->digital_write(true);
-  this->cs1_pin_->digital_write(true);
-}
-
 void EPaperT133A01::dump_config() {
   EPaperBase::dump_config();
   LOG_PIN("  CS Pin: ", this->cs_pin_);

esphome/components/epaper_spi/epaper_spi_t133a01.h

@@ -46,7 +46,6 @@ class EPaperT133A01 : public EPaperBase {
   void deep_sleep() override;
 
   bool transfer_data() override;
-  void abort_transfer() override;
 
   /**
    * Send a command (and optional data) selecting one or both controllers.

esphome/components/epaper_spi/epaper_spi_uc8179.h

@@ -37,7 +37,6 @@ class EPaperUC8179 final : public EPaperBase {
   }
 
  protected:
-  bool buffer_is_mono() const override { return true; }
   bool initialise(bool partial) override;
   bool transfer_data() override;
   void refresh_screen(bool partial) override;

esphome/components/epaper_spi/models/jd79660.py

@@ -87,38 +87,6 @@ jd79660.extend(
     ),
 )
 
-# Waveshare 2.13-G (V2 hardware/init revision, PCB marked "rev 2.1" or later)
-#
-# Vendor init derived from vendor sample code
-# <https://github.com/waveshareteam/e-Paper/blob/master/E-paper_Separate_Program/2in13_e-Paper_G/ESP32/EPD_2in13g_V2.cpp>
-# Compatible MIT license, see esphome/LICENSE file.
-#
-# Note: busy pin uses LOW=busy, HIGH=idle. Configure with inverted: true in YAML.
-# Note: panel is 122px wide, but vendor code declares the TRES register as a fixed
-# 124 on this revision. width=124 is declared here (rather than 122) purely so the
-# transferred bytes-per-row matches what the vendor init tells the IC to expect; the
-# extra 2 columns fall outside the visible glass. The model width must equal the
-# TRES value in initsequence, so overriding dimensions: in YAML brings the shear back.
-#
-# fmt: off
-jd79660.extend(
-    "Waveshare-2.13in-G",
-    width=124,
-    height=250,
-
-    initsequence=(
-        (0x61, 0x00, 0x7C, 0x00, 0xFA,),  # TRES: 124x250 fixed (124 = TRES stride value)
-        (0xE9, 0x01,),
-        # Power On (0x04): Must be early part of init seq = Disabled later!
-        (0x04,),
-    ),
-    fast_update=(
-        (0xE0, 0x02,),
-        (0xE6, 0x5A,),
-        (0xA5,),
-    ),
-)
-
 # Waveshare 7.5-H
 #
 # Vendor init derived from vendor sample code
@@ -162,7 +130,7 @@ jd79660.extend(
 # Note: busy pin uses LOW=busy, HIGH=idle.
 #
 # fmt: off
-gdey0213f51 = jd79660.extend(
+jd79660.extend(
     "goodisplay-gdey0213f51-2.13",
     width=128,
     height=250,
@@ -186,13 +154,3 @@ gdey0213f51 = jd79660.extend(
         (0x04,),
     ),
 )
-
-# Waveshare 2.13-G (V1 hardware/init revision, older stock): the same panel and init as the Good
-# Display entry above, byte for byte, so it only adds the name. Vendor sample:
-# <https://github.com/waveshareteam/e-Paper/blob/master/E-paper_Separate_Program/2in13_e-Paper_G/ESP32/EPD_2in13g.cpp>
-# Compatible MIT license, see esphome/LICENSE file.
-#
-# Note: busy pin uses LOW=busy, HIGH=idle. Configure with inverted: true in YAML.
-# Note: width=128 is the TRES value the init sequence programs, not the 122 visible columns; overriding
-# dimensions: in YAML shears the image. Not tested on V1 hardware.
-gdey0213f51.extend("Waveshare-2.13in-G-V1")

esphome/components/epaper_spi/models/waveshare_b.py

@@ -24,11 +24,3 @@ WaveshareB(
     data_rate="10MHz",
     minimum_update_interval="1s",
 )
-
-WaveshareB(
-    "waveshare-2.66in-b",
-    width=152,
-    height=296,
-    data_rate="10MHz",
-    minimum_update_interval="15s",
-)

esphome/components/es8388/es8388.cpp

@@ -111,36 +111,24 @@ void ES8388::setup() {
   // Power on ADC, Enable LIN&RIN, Power off MICBIAS, set int1lp to low power mode
   ES8388_ERROR_FAILED(this->write_byte(ES8388_ADCPOWER, 0x09));
 
-#ifdef USE_ES8388_SELECT
+#ifdef USE_SELECT
   if (this->dac_output_select_ != nullptr) {
-    if (this->dac_output_initial_.has_value()) {
-      const DacOutputLine line = this->dac_output_initial_.value();
-      ES8388_ERROR_FAILED(this->set_dac_output(line));
-      this->dac_output_select_->publish_state(static_cast<size_t>(line));
-    } else {
-      auto dac_power = this->get_dac_power();
-      if (dac_power.has_value()) {
-        if (this->dac_output_select_->has_index(dac_power.value())) {
-          this->dac_output_select_->publish_state(dac_power.value());
-        } else {
-          ESP_LOGW(TAG, "Unknown DAC output power value: %d", dac_power.value());
-        }
+    auto dac_power = this->get_dac_power();
+    if (dac_power.has_value()) {
+      if (this->dac_output_select_->has_index(dac_power.value())) {
+        this->dac_output_select_->publish_state(dac_power.value());
+      } else {
+        ESP_LOGW(TAG, "Unknown DAC output power value: %d", dac_power.value());
       }
     }
   }
   if (this->adc_input_mic_select_ != nullptr) {
-    if (this->adc_input_mic_initial_.has_value()) {
-      const AdcInputMicLine line = this->adc_input_mic_initial_.value();
-      ES8388_ERROR_FAILED(this->set_adc_input_mic(line));
-      this->adc_input_mic_select_->publish_state(static_cast<size_t>(line));
-    } else {
-      auto mic_input = this->get_mic_input();
-      if (mic_input.has_value()) {
-        if (this->adc_input_mic_select_->has_index(mic_input.value())) {
-          this->adc_input_mic_select_->publish_state(mic_input.value());
-        } else {
-          ESP_LOGW(TAG, "Unknown ADC input mic value: %d", mic_input.value());
-        }
+    auto mic_input = this->get_mic_input();
+    if (mic_input.has_value()) {
+      if (this->adc_input_mic_select_->has_index(mic_input.value())) {
+        this->adc_input_mic_select_->publish_state(mic_input.value());
+      } else {
+        ESP_LOGW(TAG, "Unknown ADC input mic value: %d", mic_input.value());
       }
     }
   }
@@ -150,7 +138,7 @@ void ES8388::setup() {
 void ES8388::dump_config() {
   ESP_LOGCONFIG(TAG, "ES8388 Audio Codec:");
   LOG_I2C_DEVICE(this);
-#ifdef USE_ES8388_SELECT
+#ifdef USE_SELECT
   LOG_SELECT("  ", "DacOutputSelect", this->dac_output_select_);
   LOG_SELECT("  ", "ADCInputMicSelect", this->adc_input_mic_select_);
 #endif

esphome/components/es8388/es8388.h

@@ -5,7 +5,7 @@
 #include "esphome/components/audio_dac/audio_dac.h"
 #include "esphome/components/i2c/i2c.h"
 #include "esphome/core/component.h"
-#ifdef USE_ES8388_SELECT
+#ifdef USE_SELECT
 #include "esphome/components/select/select.h"
 #endif
 
@@ -26,7 +26,7 @@ enum AdcInputMicLine : uint8_t {
 };
 
 class ES8388 final : public audio_dac::AudioDac, public Component, public i2c::I2CDevice {
-#ifdef USE_ES8388_SELECT
+#ifdef USE_SELECT
   SUB_SELECT(dac_output)
   SUB_SELECT(adc_input_mic)
 #endif
@@ -68,22 +68,11 @@ class ES8388 final : public audio_dac::AudioDac, public Component, public i2c::I
   bool set_dac_output(DacOutputLine line);
   bool set_adc_input_mic(AdcInputMicLine line);
 
-#ifdef USE_ES8388_SELECT
-  /// Line to apply in setup() instead of keeping what the codec reports.
-  void set_dac_output_initial(DacOutputLine line) { this->dac_output_initial_ = line; }
-  void set_adc_input_mic_initial(AdcInputMicLine line) { this->adc_input_mic_initial_ = line; }
-#endif
-
  protected:
   /// @brief Mutes or unmutes the DAC audio out
   /// @param mute_state True to mute, false to unmute
   /// @return True if successful and false otherwise
   bool set_mute_state_(bool mute_state);
-
-#ifdef USE_ES8388_SELECT
-  optional<DacOutputLine> dac_output_initial_{};
-  optional<AdcInputMicLine> adc_input_mic_initial_{};
-#endif
 };
 
 }  // namespace esphome::es8388

esphome/components/es8388/select/__init__.py

@@ -1,11 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
-from esphome.const import (
-    CONF_INITIAL_OPTION,
-    ENTITY_CATEGORY_CONFIG,
-    ICON_CHIP,  # noqa: F401
-)
+from esphome.const import ENTITY_CATEGORY_CONFIG, ICON_CHIP  # noqa: F401
 from esphome.types import ConfigType
 
 from ..audio_dac import CONF_ES8388_ID, ES8388, es8388_ns
@@ -13,21 +9,6 @@ from ..audio_dac import CONF_ES8388_ID, ES8388, es8388_ns
 CONF_DAC_OUTPUT = "dac_output"
 CONF_ADC_INPUT_MIC = "adc_input_mic"
 
-DacOutputLine = es8388_ns.enum("DacOutputLine")
-DAC_OUTPUT_OPTIONS = {
-    "LINE1": DacOutputLine.DAC_OUTPUT_LINE1,
-    "LINE2": DacOutputLine.DAC_OUTPUT_LINE2,
-    "BOTH": DacOutputLine.DAC_OUTPUT_BOTH,
-}
-DAC_OUTPUT_OPTION_NAMES = list(DAC_OUTPUT_OPTIONS)
-AdcInputMicLine = es8388_ns.enum("AdcInputMicLine")
-ADC_INPUT_MIC_OPTIONS = {
-    "LINE1": AdcInputMicLine.ADC_INPUT_MIC_LINE1,
-    "LINE2": AdcInputMicLine.ADC_INPUT_MIC_LINE2,
-    "DIFFERENCE": AdcInputMicLine.ADC_INPUT_MIC_DIFFERENCE,
-}
-ADC_INPUT_MIC_OPTION_NAMES = list(ADC_INPUT_MIC_OPTIONS)
-
 DacOutputSelect = es8388_ns.class_("DacOutputSelect", select.Select)
 ADCInputMicSelect = es8388_ns.class_("ADCInputMicSelect", select.Select)
 
@@ -38,45 +19,24 @@ CONFIG_SCHEMA = cv.All(
             DacOutputSelect,
             entity_category=ENTITY_CATEGORY_CONFIG,
             icon=ICON_CHIP,
-        ).extend(
-            {
-                cv.Optional(CONF_INITIAL_OPTION): cv.enum(
-                    DAC_OUTPUT_OPTIONS, upper=True
-                ),
-            }
         ),
         cv.Optional(CONF_ADC_INPUT_MIC): select.select_schema(
             ADCInputMicSelect,
             entity_category=ENTITY_CATEGORY_CONFIG,
             icon=ICON_CHIP,
-        ).extend(
-            {
-                cv.Optional(CONF_INITIAL_OPTION): cv.enum(
-                    ADC_INPUT_MIC_OPTIONS, upper=True
-                ),
-            }
         ),
     }
 )
 
 
 async def to_code(config: ConfigType) -> None:
-    cg.add_define("USE_ES8388_SELECT")
     hub = await cg.get_variable(config[CONF_ES8388_ID])
     selects = select.sub_selects(config, parent=hub)
     await selects(
-        CONF_DAC_OUTPUT, hub.set_dac_output_select, options=DAC_OUTPUT_OPTION_NAMES
+        CONF_DAC_OUTPUT, hub.set_dac_output_select, options=["LINE1", "LINE2", "BOTH"]
     )
     await selects(
         CONF_ADC_INPUT_MIC,
         hub.set_adc_input_mic_select,
-        options=ADC_INPUT_MIC_OPTION_NAMES,
+        options=["LINE1", "LINE2", "DIFFERENCE"],
     )
-    if (
-        initial := config.get(CONF_DAC_OUTPUT, {}).get(CONF_INITIAL_OPTION)
-    ) is not None:
-        cg.add(hub.set_dac_output_initial(initial))
-    if (
-        initial := config.get(CONF_ADC_INPUT_MIC, {}).get(CONF_INITIAL_OPTION)
-    ) is not None:
-        cg.add(hub.set_adc_input_mic_initial(initial))

esphome/components/esp32/__init__.py

@@ -10,13 +10,11 @@ import subprocess
 from typing import Any
 
 from esphome import yaml_util
-from esphome.code_scan import keep_float_scanf
 import esphome.codegen as cg
 from esphome.components.const import (
     CONF_ENABLE_OTA_DOWNGRADE_PROTECTION,
     CONF_IGNORE_NOT_FOUND,
 )
-from esphome.config_helpers import filter_source_files_from_defines
 import esphome.config_validation as cv
 from esphome.const import (
     CONF_ADVANCED,
@@ -204,10 +202,6 @@ PSRAM_XIP_VARIANTS = {
 # neither, so the engine is already in the image and the wrap saves nothing.
 ROM_VSNPRINTF_WITHOUT_VASPRINTF_VARIANTS = {VARIANT_ESP32C6}
 
-# Variants whose ROM exports sscanf with the newlib format in use (C6 normal
-# format, C2 nano format by IDF default), so the sscanf wrap saves nothing.
-ROM_SSCANF_VARIANTS = {VARIANT_ESP32C2, VARIANT_ESP32C6}
-
 # NVS encryption (HMAC peripheral scheme) is only available on variants that
 # expose the HMAC peripheral (SOC_HMAC_SUPPORTED in soc_caps.h). The original
 # ESP32 and ESP32-C2 do not have it. New variants with an HMAC peripheral
@@ -2024,7 +2018,6 @@ CONF_RINGBUF_IN_IRAM = "ringbuf_in_iram"
 CONF_HEAP_IN_IRAM = "heap_in_iram"
 CONF_LOOP_TASK_STACK_SIZE = "loop_task_stack_size"
 CONF_USE_FULL_CERTIFICATE_BUNDLE = "use_full_certificate_bundle"
-CONF_ENABLE_FULL_SCANF = "enable_full_scanf"
 CONF_DISABLE_DEBUG_STUBS = "disable_debug_stubs"
 CONF_DISABLE_OCD_AWARE = "disable_ocd_aware"
 CONF_DISABLE_USB_SERIAL_JTAG_SECONDARY = "disable_usb_serial_jtag_secondary"
@@ -2320,7 +2313,6 @@ FRAMEWORK_SCHEMA = cv.Schema(
                     CONF_INCLUDE_BUILTIN_IDF_COMPONENTS, default=[]
                 ): cv.ensure_list(cv.string_strict),
                 cv.Optional(CONF_ENABLE_FULL_PRINTF, default=False): cv.boolean,
-                cv.Optional(CONF_ENABLE_FULL_SCANF): cv.boolean,
                 cv.Optional(CONF_DISABLE_DEBUG_STUBS, default=True): cv.boolean,
                 cv.Optional(CONF_DISABLE_OCD_AWARE, default=True): cv.boolean,
                 cv.Optional(
@@ -2622,32 +2614,6 @@ async def _set_libc_picolibc_newlib_compat() -> None:
     )
 
 
-def _add_wrap_stub(symbol: str, define: str) -> None:
-    """Emit a linker wrap for ``symbol`` served by a stub compiled under ``define``.
-
-    --undefined pulls the stub from libsrc.a, scanned before the IDF library that
-    references the symbol.
-    """
-    cg.add_define(define)
-    cg.add_build_flag(f"-Wl,--wrap={symbol}")
-    cg.add_build_flag(f"-Wl,--undefined=__wrap_{symbol}")
-
-
-@coroutine_with_priority(CoroPriority.FINAL)
-async def _add_sscanf_stub(enable_full_scanf: bool | None) -> None:
-    """Wrap sscanf when bluedroid is the only reason newlib's scanf engine links.
-
-    FINAL priority so every request_bluetooth() call has happened.
-    """
-    if get_esp32_variant() in ROM_SSCANF_VARIANTS or not _network_sdkconfig().bluetooth:
-        return
-    if keep_float_scanf(
-        enable_full_scanf, CORE.config, "~13KB flash", "that call will abort the device"
-    ):
-        return
-    _add_wrap_stub("sscanf", "USE_ESP32_SSCANF_STUB")
-
-
 @coroutine_with_priority(CoroPriority.FINAL)
 async def _apply_nvs_cache_in_psram(explicit: bool) -> None:
     """Keep the NVS cache in PSRAM unless NVS encryption is on, however it was enabled."""
@@ -3088,8 +3054,9 @@ async def to_code(config):
         # saves nothing while costing ~170 B of shim. IDF 5.x defaults to
         # newlib on every variant; IDF 6.0+ switches to picolibc on every
         # variant.
-        uses_newlib = idf_version() < cv.Version(6, 0, 0)
-        if conf[CONF_ADVANCED][CONF_ENABLE_FULL_PRINTF] or not uses_newlib:
+        if conf[CONF_ADVANCED][CONF_ENABLE_FULL_PRINTF] or idf_version() >= cv.Version(
+            6, 0, 0
+        ):
             cg.add_define("USE_FULL_PRINTF")
         else:
             for symbol in ("vprintf", "printf", "fprintf", "vfprintf"):
@@ -3097,14 +3064,14 @@ async def to_code(config):
             # esp_http_client calls vasprintf, which on the ESP32-C6 is the only
             # reference to newlib's full printf engine (~20 KB: _svfprintf_r,
             # _dtoa_r and their helpers); every other caller resolves to the
-            # ROM. See vasprintf_stubs.cpp.
+            # ROM. See vasprintf_stubs.cpp. The --undefined flag is needed
+            # because libsrc.a is scanned before the IDF libraries that
+            # reference the symbol, so the stub would otherwise never be pulled
+            # from the archive.
             if variant in ROM_VSNPRINTF_WITHOUT_VASPRINTF_VARIANTS:
-                _add_wrap_stub("vasprintf", "USE_ESP32_VASPRINTF_STUB")
-        if uses_newlib:
-            # bluedroid's sscanf calls; see sscanf_stubs.cpp
-            CORE.add_job(
-                _add_sscanf_stub, conf[CONF_ADVANCED].get(CONF_ENABLE_FULL_SCANF)
-            )
+                cg.add_define("USE_ESP32_VASPRINTF_STUB")
+                cg.add_build_flag("-Wl,--wrap=vasprintf")
+                cg.add_build_flag("-Wl,--undefined=__wrap_vasprintf")
     else:
         cg.add_build_flag("-DUSE_ARDUINO")
         cg.add_build_flag("-DUSE_ESP32_FRAMEWORK_ARDUINO")
@@ -4094,12 +4061,3 @@ def process_stacktrace(config, line, backtrace_state):
             _decode_pc(config, addr.group())
 
     return backtrace_state
-
-
-# Each stub only compiles under its define, so keep the sources out of other builds
-FILTER_SOURCE_FILES = filter_source_files_from_defines(
-    {
-        "sscanf_stubs.cpp": "USE_ESP32_SSCANF_STUB",
-        "vasprintf_stubs.cpp": "USE_ESP32_VASPRINTF_STUB",
-    }
-)

esphome/components/esp32/preferences.cpp

@@ -131,7 +131,6 @@ bool ESP32PreferenceBackend::load(uint8_t *data, size_t len) {
 void ESP32Preferences::open() {
   // Runs from app_main() before the logger is initialized; any logging here
   // must be deferred. See s_open_err and make_preference() below.
-  // Components that need NVS check nvs_handle instead of initializing it again.
   nvs_flash_init();
   esp_err_t err = nvs_open("esphome", NVS_READWRITE, &this->nvs_handle);
   if (err == 0)

esphome/components/esp32/sscanf_stubs.cpp

@@ -1,43 +0,0 @@
-/*
- * Linker wrap for sscanf on ESP-IDF with newlib.
- *
- * bluedroid's two "%02x" parses are the only sscanf callers in an ESPHome
- * image and link newlib's whole scanf engine (~13 KB with _strtod_l). Routing
- * them through core/sscanf_no_float.h drops it; floats would pull _strtod_l
- * back, so those abort naming enable_full_scanf. See _add_sscanf_stub in
- * esp32/__init__.py for when this is emitted.
- */
-
-#include "esphome/core/defines.h"
-
-#if defined(USE_ESP_IDF) && defined(USE_ESP32_SSCANF_STUB)
-
-#include <cstdarg>
-#include <cstdio>
-
-#include "esp_system.h"
-#include "esphome/core/sscanf_no_float.h"
-
-namespace esphome::esp32 {}
-
-// NOLINTBEGIN(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp,readability-identifier-naming)
-extern "C" {
-
-int __wrap_sscanf(const char *str, const char *fmt, ...) {
-  va_list ap;
-  va_start(ap, fmt);
-  int result = esphome::vsscanf_no_float(str, fmt, ap);
-  va_end(ap);
-  if (result == esphome::SSCANF_UNSUPPORTED) {
-    char msg[160];
-    snprintf(msg, sizeof(msg),
-             "sscanf: unsupported conversion in \"%s\"; set enable_full_scanf: true in esp32 framework", fmt);
-    esp_system_abort(msg);
-  }
-  return result;
-}
-
-}  // extern "C"
-// NOLINTEND(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp,readability-identifier-naming)
-
-#endif  // USE_ESP_IDF && USE_ESP32_SSCANF_STUB

esphome/components/esp32_ble/ble.cpp

@@ -5,7 +5,6 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/preferences.h"
 
 #ifndef CONFIG_BT_CONTROLLER_DISABLED
 #include <esp_bt.h>
@@ -29,6 +28,7 @@ extern "C" {
 #include <freertos/FreeRTOS.h>
 #include <freertos/FreeRTOSConfig.h>
 #include <freertos/task.h>
+#include <nvs_flash.h>
 
 #ifdef USE_ARDUINO
 // Prevent Arduino from releasing BT memory at startup (esp32-hal-misc.c).
@@ -77,9 +77,8 @@ static constexpr uint32_t HOSTED_BT_WDT_TIMEOUT_MS = 60000;
 
 void ESP32BLE::setup() {
   global_ble = this;
-  // Preferences opens NVS in app_main(); a zero handle means it could not be opened, even after an erase
-  if (global_preferences->nvs_handle == 0) {
-    ESP_LOGE(TAG, "NVS unavailable");
+  if (!ble_pre_setup_()) {
+    ESP_LOGE(TAG, "BLE could not be prepared for configuration");
     this->mark_failed();
     return;
   }
@@ -186,6 +185,15 @@ void ESP32BLE::advertising_remove_service_uuid(ESPBTUUID uuid) {
 }
 #endif
 
+bool ESP32BLE::ble_pre_setup_() {
+  esp_err_t err = nvs_flash_init();
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "nvs_flash_init failed: %d", err);
+    return false;
+  }
+  return true;
+}
+
 #ifdef USE_ESP32_BLE_ADVERTISING
 void ESP32BLE::advertising_init_() {
   if (this->advertising_ != nullptr)

esphome/components/esp32_ble/ble.h

@@ -185,6 +185,7 @@ class ESP32BLE final : public Component {
     }
     this->ble_events_.get_and_reset_dropped_count();
   }
+  bool ble_pre_setup_();
 #ifdef USE_ESP32_BLE_ADVERTISING
   void advertising_init_();
 #endif

esphome/components/esp32_ble_beacon/esp32_ble_beacon.cpp

@@ -10,6 +10,7 @@
 #include <esp_gap_ble_api.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/task.h>
+#include <nvs_flash.h>
 #include <cstring>
 
 #include "esphome/core/hal.h"

esphome/components/esp32_ble_server/ble_server.cpp

@@ -7,6 +7,7 @@
 
 #ifdef USE_ESP32
 
+#include <nvs_flash.h>
 #include <freertos/FreeRTOSConfig.h>
 #include <esp_bt_main.h>
 #ifndef CONFIG_BT_CONTROLLER_DISABLED

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -16,6 +16,7 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/FreeRTOSConfig.h>
 #include <freertos/task.h>
+#include <nvs_flash.h>
 #include <cinttypes>
 
 #ifdef USE_OTA

esphome/components/esp32_camera/esp32_camera.cpp

@@ -282,7 +282,7 @@ void ESP32Camera::loop() {
   }
   this->frame_count_++;
   if (now - this->last_log_time_ >= FRAME_LOG_INTERVAL_MS) {
-    ESP_LOGD(TAG, "Received %u images in last %" PRIu32 "s", this->frame_count_, FRAME_LOG_INTERVAL_MS / 1000);
+    ESP_LOGD(TAG, "Received %u images in last %us", this->frame_count_, FRAME_LOG_INTERVAL_MS / 1000);
     this->last_log_time_ = now;
     this->frame_count_ = 0;
   }

esphome/components/esp32_can/canbus.py

@@ -6,8 +6,6 @@ import esphome.codegen as cg
 from esphome.components import canbus
 from esphome.components.canbus import CONF_BIT_RATE, CanbusComponent, CanSpeed
 from esphome.components.esp32 import (
-    CONF_MINIMUM_CHIP_REVISION,
-    KEY_ESP32,
     VARIANT_ESP32,
     VARIANT_ESP32C3,
     VARIANT_ESP32C5,
@@ -22,8 +20,6 @@ from esphome.components.esp32 import (
 )
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_ADVANCED,
-    CONF_FRAMEWORK,
     CONF_ID,
     CONF_MODE,
     CONF_RX_PIN,
@@ -31,7 +27,6 @@ from esphome.const import (
     CONF_TX_PIN,
     CONF_TX_QUEUE_LEN,
 )
-import esphome.final_validate as fv
 from esphome.types import ConfigType
 
 CODEOWNERS = ["@Sympatron"]
@@ -47,7 +42,6 @@ CanMode = esp32_can_ns.enum("CanMode")
 CAN_MODES = {
     "NORMAL": CanMode.CAN_MODE_NORMAL,
     "LISTENONLY": CanMode.CAN_MODE_LISTEN_ONLY,
-    "NO_ACK": CanMode.CAN_MODE_NO_ACK,
 }
 
 # Currently the driver only supports a subset of the bit rates defined in canbus
@@ -55,7 +49,6 @@ CAN_MODES = {
 # See ESP-IDF Programming Guide --> API Reference --> Two-Wire Automotive Interface (TWAI)
 
 CAN_SPEEDS_ESP32 = {
-    "20KBPS": CanSpeed.CAN_20KBPS,
     "25KBPS": CanSpeed.CAN_25KBPS,
     "50KBPS": CanSpeed.CAN_50KBPS,
     "100KBPS": CanSpeed.CAN_100KBPS,
@@ -121,22 +114,6 @@ CONFIG_SCHEMA = canbus.CANBUS_SCHEMA.extend(
 )
 
 
-def _final_validate(config: ConfigType) -> None:
-    if get_esp32_variant() == VARIANT_ESP32 and config[CONF_BIT_RATE] == "20KBPS":
-        esp32_config = fv.full_config.get()[KEY_ESP32]
-        min_revision = esp32_config[CONF_FRAMEWORK][CONF_ADVANCED].get(
-            CONF_MINIMUM_CHIP_REVISION
-        )
-        if min_revision is None or min_revision < "2.0":
-            raise cv.Invalid(
-                "20KBPS on ESP32 requires esp32.framework.advanced.minimum_chip_revision: '2.0' or higher",
-                path=[CONF_BIT_RATE],
-            )
-
-
-FINAL_VALIDATE_SCHEMA = _final_validate
-
-
 def get_default_tx_enqueue_timeout(bit_rate: str) -> int:
     bit_rate_numeric = canbus.get_rate(bit_rate)
     bits_per_packet = 140  # ~max CAN message length

esphome/components/esp32_can/esp32_can.cpp

@@ -33,10 +33,6 @@ static bool get_bitrate(canbus::CanSpeed bitrate, twai_timing_config_t *t_config
     case canbus::CAN_16KBPS:
       *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_16KBITS();
       return true;
-#endif
-#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32C61) || \
-    defined(USE_ESP32_VARIANT_ESP32H2) || defined(USE_ESP32_VARIANT_ESP32P4) || defined(USE_ESP32_VARIANT_ESP32S2) || \
-    defined(USE_ESP32_VARIANT_ESP32S3) || (defined(USE_ESP32_VARIANT_ESP32) && CONFIG_ESP32_REV_MIN_FULL >= 200)
     case canbus::CAN_20KBPS:
       *t_config = (twai_timing_config_t) TWAI_TIMING_CONFIG_20KBITS();
       return true;
@@ -79,13 +75,10 @@ bool ESP32Can::setup_internal() {
   }
 
   // Select TWAI mode based on configuration
-  twai_mode_t twai_mode = TWAI_MODE_NORMAL;
+  twai_mode_t twai_mode = (this->mode_ == CAN_MODE_LISTEN_ONLY) ? TWAI_MODE_LISTEN_ONLY : TWAI_MODE_NORMAL;
+
   if (this->mode_ == CAN_MODE_LISTEN_ONLY) {
-    twai_mode = TWAI_MODE_LISTEN_ONLY;
     ESP_LOGI(TAG, "CAN bus configured in LISTEN_ONLY mode (passive, no ACKs)");
-  } else if (this->mode_ == CAN_MODE_NO_ACK) {
-    twai_mode = TWAI_MODE_NO_ACK;
-    ESP_LOGI(TAG, "CAN bus configured in NO_ACK mode (transmit without requiring ACK)");
   }
 
   twai_general_config_t g_config =

esphome/components/esp32_can/esp32_can.h

@@ -12,7 +12,6 @@ namespace esphome::esp32_can {
 enum CanMode : uint8_t {
   CAN_MODE_NORMAL = 0,
   CAN_MODE_LISTEN_ONLY = 1,
-  CAN_MODE_NO_ACK = 2,
 };
 
 class ESP32Can final : public canbus::Canbus {

esphome/components/esp32_hosted/esp_now_hosted.cpp

@@ -42,7 +42,6 @@ extern "C" {
 }
 
 #include "esp_now_hosted_rpc.h"
-#include "esphome/core/log.h"
 
 namespace {
 
@@ -53,8 +52,6 @@ ESPHOME_LOG_TAG(TAG, "esp_now_hosted");
 // single esp-hosted RPC RX thread. Serializing requests keeps the shared
 // response slot race-free; a sequence number stops a late/stale response from
 // being mistaken for ours.
-// NOLINTBEGIN(cppcoreguidelines-avoid-non-const-global-variables): the shim is
-// C-ABI state shared between the main loop and the esp-hosted RX thread.
 SemaphoreHandle_t g_req_mutex = nullptr;
 SemaphoreHandle_t g_resp_sem = nullptr;  // given when the matching RESP lands
 bool g_setup_done = false;               // set only after setup fully succeeds
@@ -88,7 +85,6 @@ constexpr size_t ESP_NOW_HOSTED_MAX_PEERS = 20;
 uint8_t g_peer_cache[ESP_NOW_HOSTED_MAX_PEERS][6];
 size_t g_peer_count = 0;
 portMUX_TYPE g_peer_lock = portMUX_INITIALIZER_UNLOCKED;
-// NOLINTEND(cppcoreguidelines-avoid-non-const-global-variables)
 
 // Caller must hold g_peer_lock.
 int peer_cache_find_locked(const uint8_t *mac) {
@@ -235,14 +231,12 @@ esp_err_t ensure_setup() {
     g_resp_sem = xSemaphoreCreateBinary();
   if (g_req_mutex == nullptr || g_resp_sem == nullptr)
     return ESP_ERR_NO_MEM;
-  esp_err_t err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_RESP, on_resp, nullptr);
-  if (err != ESP_OK)
+  esp_err_t err;
+  if ((err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_RESP, on_resp, nullptr)) != ESP_OK)
     return err;
-  err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_RECV, on_recv, nullptr);
-  if (err != ESP_OK)
+  if ((err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_RECV, on_recv, nullptr)) != ESP_OK)
     return err;
-  err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_SEND, on_send, nullptr);
-  if (err != ESP_OK)
+  if ((err = esp_hosted_register_custom_callback(ESP_NOW_HOSTED_MSG_SEND, on_send, nullptr)) != ESP_OK)
     return err;
   g_setup_done = true;
   return ESP_OK;
@@ -428,11 +422,10 @@ esp_err_t esp_now_send(const uint8_t *peer_addr, const uint8_t *data, size_t len
   uint8_t hdr[sizeof(esp_now_hosted_send_req_t)];
   auto *s = reinterpret_cast<esp_now_hosted_send_req_t *>(hdr);
   s->has_addr = peer_addr != nullptr ? 1 : 0;
-  if (peer_addr != nullptr) {
+  if (peer_addr != nullptr)
     memcpy(s->peer_addr, peer_addr, 6);
-  } else {
+  else
     memset(s->peer_addr, 0, 6);
-  }
   s->data_len = static_cast<uint16_t>(len);
   // Fire-and-forget (wait=false): native esp_now_send returns once the frame is
   // queued, with the real TX result delivered later through the send callback.

esphome/components/esp8266/__init__.py

@@ -6,7 +6,6 @@ import subprocess
 from typing import Any
 
 from esphome.build_helpers.native import native_backend
-from esphome.code_scan import keep_float_scanf
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import (
@@ -26,7 +25,13 @@ from esphome.const import (
     ThreadModel,
     Toolchain,
 )
-from esphome.core import CORE, CoroPriority, EsphomeError, coroutine_with_priority
+from esphome.core import (
+    CORE,
+    CoroPriority,
+    EsphomeError,
+    Lambda,
+    coroutine_with_priority,
+)
 from esphome.core.config import BOARD_MAX_LENGTH
 from esphome.helpers import IS_MACOS, copy_file_if_changed
 from esphome.platformio.toolchain import copy_ccache_script
@@ -48,18 +53,23 @@ from .const import (
     KEY_SERIAL1_REQUIRED,
     KEY_SERIAL_REQUIRED,
     KEY_WAVEFORM_REQUIRED,
-    PREFERENCES_RTC_EBOOT_WORDS,
-    PREFERENCES_RTC_NORMAL_WORDS,
     THROW_STUBS_HEADER,
-    check_preferences_fit,
     enable_serial,
     enable_serial1,
     esp8266_ns,
-    preferences_flash_words,
 )
 from .gpio import PinInitialState, add_pin_initial_states_array
 
 CONF_ENABLE_SCANF_FLOAT = "enable_scanf_float"
+# Heuristically matches scanf/sscanf calls with float format specifiers.
+# Standard scanf float conversions: %f %F %e %E %g %G %a %A
+# With optional modifiers: %*f (suppression), %8f (width), %lf %Lf (length)
+# Also matches non-standard patterns like %.2f as a heuristic — these are
+# invalid in scanf but users may write them by analogy with printf.
+# Uses [^;]*? to stay within a single statement, preventing false positives
+# from e.g. sscanf(buf, "%d", &x); printf("%f", val);
+_SCANF_FLOAT_RE = re.compile(r"scanf\s*\([^;]*?%[*\d.]*[hlL]*[feEgGaAF]")
+
 CODEOWNERS = ["@esphome/core"]
 DOMAIN = "esp8266"
 _LOGGER = logging.getLogger(__name__)
@@ -67,6 +77,26 @@ AUTO_LOAD = ["preferences"]
 IS_TARGET_PLATFORM = True
 
 
+def lambdas_use_scanf_float(config: ConfigType) -> bool:
+    """Check if any lambda in the config uses scanf with a float format specifier.
+
+    Comments are stripped before matching to avoid false positives from
+    commented-out code. The cost of a false positive is only ~8KB flash.
+    """
+    stack: list = [config]
+    while stack:
+        obj = stack.pop()
+        if isinstance(obj, Lambda):
+            src = obj.comment_remover(obj.value)
+            if _SCANF_FLOAT_RE.search(src):
+                return True
+        elif isinstance(obj, dict):
+            stack.extend(obj.values())
+        elif isinstance(obj, list):
+            stack.extend(obj)
+    return False
+
+
 def set_core_data(config: ConfigType) -> ConfigType:
     CORE.data[KEY_ESP8266] = {}
     CORE.data[KEY_CORE][KEY_TARGET_PLATFORM] = PLATFORM_ESP8266
@@ -387,12 +417,13 @@ async def to_code(config: ConfigType) -> None:
     cg.add_define(ThreadModel.SINGLE)
     cg.add_define("USE_ESP8266_CRASH_HANDLER")
 
-    enable_scanf_float = keep_float_scanf(
-        config.get(CONF_ENABLE_SCANF_FLOAT),
-        CORE.config,
-        "~8KB flash",
-        "that call will not parse",
-    )
+    enable_scanf_float = config.get(CONF_ENABLE_SCANF_FLOAT)
+    if enable_scanf_float is None and lambdas_use_scanf_float(CORE.config):
+        enable_scanf_float = True
+        _LOGGER.warning(
+            "Lambda uses scanf with a float format specifier; "
+            "enabling scanf float support (~8KB flash)"
+        )
 
     # The native generator reads the same decision (KEY_SCANF_FLOAT)
     CORE.data[KEY_ESP8266][KEY_SCANF_FLOAT] = bool(enable_scanf_float)
@@ -436,12 +467,6 @@ async def to_code(config: ConfigType) -> None:
     # Other projects like Tasmota & ESPEasy also use this
     cg.add_build_flag("-DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH")
 
-    cg.add_define("ESP8266_PREFERENCES_RTC_NORMAL_WORDS", PREFERENCES_RTC_NORMAL_WORDS)
-    cg.add_define("ESP8266_PREFERENCES_RTC_EBOOT_WORDS", PREFERENCES_RTC_EBOOT_WORDS)
-    cg.add_define(
-        "ESP8266_PREFERENCES_FLASH_WORDS",
-        preferences_flash_words(config[CONF_RESTORE_FROM_FLASH]),
-    )
     if config[CONF_RESTORE_FROM_FLASH]:
         cg.add_define("USE_ESP8266_PREFERENCES_FLASH")
 
@@ -503,7 +528,6 @@ async def to_code(config: ConfigType) -> None:
     CORE.add_job(add_pin_initial_states_array)
     CORE.add_job(finalize_waveform_config)
     CORE.add_job(finalize_serial_config)
-    CORE.add_job(check_preferences_fit)
 
 
 @coroutine_with_priority(CoroPriority.WORKAROUNDS)

esphome/components/esp8266/const.py

@@ -1,13 +1,9 @@
-import logging
-
 import esphome.codegen as cg
 
 # Re-exported from the shared definition; here it indexes the BOARDS
 # metadata dicts, whose entries in boards.py spell the literal.
 from esphome.const import KEY_FLASH_SIZE  # noqa: F401  # pylint: disable=unused-import
-from esphome.core import CORE, CoroPriority, EsphomeError, coroutine_with_priority
-
-_LOGGER = logging.getLogger(__name__)
+from esphome.core import CORE
 
 KEY_ESP8266 = "esp8266"
 KEY_BOARD = "board"
@@ -28,87 +24,6 @@ KEY_LDSCRIPT = "ldscript"
 # Crash-decode tools, resolved once per run by __init__
 KEY_DECODE_TOOLS = "decode_tools"
 
-# Saved-settings space in 4-byte words; preferences.cpp gets these as defines. A value cannot span the two
-# RTC regions, and the flash store is smaller when only explicit flash preferences use it.
-PREFERENCES_RTC_NORMAL_WORDS = 78
-PREFERENCES_RTC_EBOOT_WORDS = 32
-PREFERENCES_RTC_WORDS = PREFERENCES_RTC_NORMAL_WORDS + PREFERENCES_RTC_EBOOT_WORDS
-PREFERENCES_FLASH_WORDS = 128
-PREFERENCES_FLASH_WORDS_WITHOUT_RESTORE = 64
-KEY_PREFERENCES = "preferences"
-
-
-def preferences_flash_words(restore_from_flash: bool) -> int:
-    """Size of the flash store for this configuration."""
-    return (
-        PREFERENCES_FLASH_WORDS
-        if restore_from_flash
-        else PREFERENCES_FLASH_WORDS_WITHOUT_RESTORE
-    )
-
-
-def preference_words(value_bytes: int) -> int:
-    """Words a saved value takes, checksum word included (rtc_pref_bytes_to_words plus one)."""
-    return (value_bytes + 3) // 4 + 1
-
-
-def reserve_preferences(
-    count: int, value_bytes: int, in_flash: bool | None = None
-) -> None:
-    """Record saved values a component creates; check_preferences_fit() adds them all up.
-
-    in_flash is the value's own storage, as passed to make_preference(); None is the two-argument
-    form, which follows restore_from_flash.
-    """
-    if in_flash is None:
-        in_flash = CORE.config[KEY_ESP8266][CONF_RESTORE_FROM_FLASH]
-    reservations = CORE.data.setdefault(KEY_ESP8266, {}).setdefault(KEY_PREFERENCES, [])
-    reservations.extend([(preference_words(value_bytes), in_flash)] * count)
-
-
-def _rtc_values_can_split(values: list[int]) -> bool:
-    """Whether some order fills the two RTC regions without a value spanning them."""
-    total = sum(values)
-    if total <= PREFERENCES_RTC_NORMAL_WORDS:
-        return True
-    # Bit i of reachable is set when some subset of the values sums to i
-    reachable = 1
-    for words in values:
-        reachable |= reachable << words
-    lowest = max(0, total - PREFERENCES_RTC_EBOOT_WORDS)
-    highest = min(total, PREFERENCES_RTC_NORMAL_WORDS)
-    return any(reachable >> normal & 1 for normal in range(lowest, highest + 1))
-
-
-@coroutine_with_priority(CoroPriority.FINAL)
-async def check_preferences_fit() -> None:
-    """Fail the build when the reserved saved values cannot fit the space preferences.cpp has."""
-    flash_store = preferences_flash_words(
-        CORE.config[KEY_ESP8266][CONF_RESTORE_FROM_FLASH]
-    )
-    reservations = CORE.data[KEY_ESP8266].get(KEY_PREFERENCES, [])
-    flash_words = sum(w for w, in_flash in reservations if in_flash)
-    rtc_values = [w for w, in_flash in reservations if not in_flash]
-    if flash_words > flash_store:
-        raise EsphomeError(
-            f"Saved values need {flash_words} words but the ESP8266 flash store has {flash_store}; "
-            "use fewer or smaller saved values"
-        )
-    if not _rtc_values_can_split(rtc_values):
-        raise EsphomeError(
-            f"Saved values need {sum(rtc_values)} words but ESP8266 RTC memory has {PREFERENCES_RTC_WORDS} in "
-            f"regions of {PREFERENCES_RTC_NORMAL_WORDS} and {PREFERENCES_RTC_EBOOT_WORDS} that a value cannot "
-            "span; use fewer or smaller saved values, or store them in flash"
-        )
-    if sum(rtc_values) > PREFERENCES_RTC_NORMAL_WORDS:
-        _LOGGER.warning(
-            "Saved values reserve %d of %d words of ESP8266 RTC memory; the fit depends on setup order, and "
-            "saved settings that do not reserve are not counted",
-            sum(rtc_values),
-            PREFERENCES_RTC_WORDS,
-        )
-
-
 # esp8266 namespace is already defined by arduino, manually prefix esphome
 esp8266_ns = cg.global_ns.namespace("esphome").namespace("esp8266")
 

esphome/components/esp8266/crash_handler.cpp

@@ -4,7 +4,6 @@
 #ifdef USE_ESP8266_CRASH_HANDLER
 
 #include "crash_handler.h"
-#include "rtc_layout.h"
 #include "esphome/core/log.h"
 
 #include <cinttypes>
@@ -47,8 +46,11 @@ static inline bool IRAM_ATTR is_code_addr(uint32_t val) {
 // Recover the actual code address from a windowed-ABI return address on the stack.
 static inline uint32_t IRAM_ATTR recover_code_addr(uint32_t val) { return (val & XTENSA_ADDR_MASK) | XTENSA_CODE_BASE; }
 
-// Crash data lives in the last esphome::esp8266::RTC_CRASH_WORDS of user RTC memory (rtc_layout.h).
+// RTC user memory layout for crash backtrace data.
+// User-accessible RTC memory: blocks 64-191 (each block = 4 bytes).
+// We use blocks 174-191 (last 18 blocks, 72 bytes) to minimize conflicts.
 // Store 16 raw candidates, filter to real return addresses at log time.
+static constexpr uint8_t RTC_CRASH_BASE = 174;
 static constexpr size_t MAX_BACKTRACE = 16;
 
 // Magic word packs sentinel, version, and count into one uint32_t:
@@ -76,7 +78,7 @@ struct RtcCrashData {
   uint32_t backtrace[MAX_BACKTRACE];
   uint32_t epc1;  // Fault PC, used to filter duplicates
 };
-static_assert(sizeof(RtcCrashData) == esphome::esp8266::RTC_CRASH_WORDS * 4, "RtcCrashData must fill its RTC words");
+static_assert(sizeof(RtcCrashData) == 72, "RtcCrashData must fit in 18 RTC blocks");
 
 namespace esphome::esp8266 {
 
@@ -127,7 +129,7 @@ static const LogString *get_reset_reason(uint32_t reason) {
 // Returns the number of valid backtrace entries (0 if no data found).
 static uint8_t read_rtc_backtrace(uint32_t *backtrace, size_t max_entries) {
   RtcCrashData rtc_data;
-  if (!system_rtc_mem_read(esphome::esp8266::RTC_CRASH_BASE, &rtc_data, sizeof(rtc_data)))
+  if (!system_rtc_mem_read(RTC_CRASH_BASE, &rtc_data, sizeof(rtc_data)))
     return 0;
   uint32_t magic = rtc_data.magic;
   if ((magic & CRASH_SENTINEL_MASK) != CRASH_SENTINEL || (magic & CRASH_VERSION_MASK) != CRASH_VERSION)
@@ -231,7 +233,7 @@ extern "C" void IRAM_ATTR custom_crash_callback(struct rst_info *rst_info, uint3
   data.epc1 = epc1;
   data.magic = CRASH_SENTINEL | CRASH_VERSION | count;
 
-  system_rtc_mem_write(esphome::esp8266::RTC_CRASH_BASE, &data, sizeof(data));
+  system_rtc_mem_write(RTC_CRASH_BASE, &data, sizeof(data));
 }
 
 #endif  // USE_ESP8266_CRASH_HANDLER

esphome/components/esp8266/preferences.cpp

@@ -6,7 +6,6 @@ extern "C" {
 }
 
 #include "preferences.h"
-#include "rtc_layout.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include "esphome/core/preferences_rtc.h"
@@ -18,26 +17,31 @@ namespace esphome::esp8266 {
 ESPHOME_LOG_TAG(TAG, "preferences");
 
 static constexpr uint32_t ESP_RTC_USER_MEM_START = 0x60001200;
-static constexpr uint32_t ESP_RTC_USER_MEM_SIZE_WORDS = RTC_USER_MEM_WORDS;
+static constexpr uint32_t ESP_RTC_USER_MEM_SIZE_WORDS = 128;
 static constexpr uint32_t ESP_RTC_USER_MEM_SIZE_BYTES = ESP_RTC_USER_MEM_SIZE_WORDS * 4;
 
-// RTC memory layout (sizes come from const.py through codegen):
+// RTC memory layout:
 // - Eboot region:  RTC words 0-31   (reserved, mapped from preference offset 78-109)
 // - Normal region: RTC words 32-109 (mapped from preference offset 0-77)
 // - Crash handler: RTC words 110-127 (reserved for crash_handler.cpp backtrace data)
-static constexpr uint32_t RTC_EBOOT_REGION_WORDS = ESP8266_PREFERENCES_RTC_EBOOT_WORDS;
-static constexpr uint32_t RTC_NORMAL_REGION_WORDS = ESP8266_PREFERENCES_RTC_NORMAL_WORDS;
+static constexpr uint32_t RTC_EBOOT_REGION_WORDS = 32;   // Words 0-31 reserved for eboot
+static constexpr uint32_t RTC_NORMAL_REGION_WORDS = 78;  // Words 32-109 for normal prefs
 static constexpr uint32_t PREF_TOTAL_WORDS = RTC_EBOOT_REGION_WORDS + RTC_NORMAL_REGION_WORDS;  // 110
-static_assert(PREF_TOTAL_WORDS <= RTC_CRASH_BASE - RTC_SYSTEM_USER_BASE,
-              "preference regions overlap the crash handler's RTC words");
 
 // Maximum preference size in words (limited by uint8_t length_words field)
 static constexpr uint32_t MAX_PREFERENCE_WORDS = 255;
 
 #define ESP_RTC_USER_MEM ((uint32_t *) ESP_RTC_USER_MEM_START)
 
-// Smaller without restore_from_flash, when only explicit flash preferences live here
-static constexpr uint32_t ESP8266_FLASH_STORAGE_SIZE = ESP8266_PREFERENCES_FLASH_WORDS;
+// Flash storage size depends on esp8266 -> restore_from_flash YAML option (default: false).
+// When enabled (USE_ESP8266_PREFERENCES_FLASH), all preferences default to flash and need
+// 128 words (512 bytes). When disabled, only explicit flash prefs use this storage so
+// 64 words (256 bytes) suffices since most preferences go to RTC memory instead.
+#ifdef USE_ESP8266_PREFERENCES_FLASH
+static constexpr uint32_t ESP8266_FLASH_STORAGE_SIZE = 128;
+#else
+static constexpr uint32_t ESP8266_FLASH_STORAGE_SIZE = 64;
+#endif
 
 static uint32_t
     s_flash_storage[ESP8266_FLASH_STORAGE_SIZE];  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
@@ -56,7 +60,7 @@ static inline bool esp_rtc_user_mem_write(uint32_t index, uint32_t value) {
   if (index >= ESP_RTC_USER_MEM_SIZE_WORDS) {
     return false;
   }
-  if (index < RTC_EBOOT_REGION_WORDS && s_prevent_write) {
+  if (index < 32 && s_prevent_write) {
     return false;
   }
 
@@ -119,7 +123,7 @@ static bool load_from_rtc(size_t offset, uint32_t *data, size_t len) {
 
 // Maximum buffer for any single preference - bounded by storage sizes.
 // Flash prefs: bounded by ESP8266_FLASH_STORAGE_SIZE (128 or 64 words).
-// RTC prefs: bounded by RTC_NORMAL_REGION_WORDS (78) - a single pref can't span both RTC regions.
+// RTC prefs: bounded by RTC_NORMAL_REGION_WORDS (96) - a single pref can't span both RTC regions.
 static constexpr size_t PREF_MAX_BUFFER_WORDS =
     ESP8266_FLASH_STORAGE_SIZE > RTC_NORMAL_REGION_WORDS ? ESP8266_FLASH_STORAGE_SIZE : RTC_NORMAL_REGION_WORDS;
 
@@ -176,8 +180,8 @@ ESPPreferenceObject ESP8266Preferences::make_preference(size_t length, uint32_t
   } else {
     uint32_t start = this->current_offset;
     bool in_normal = start < RTC_NORMAL_REGION_WORDS;
-    // Normal: offset 0-77 maps to RTC offset 32-109
-    // Eboot: offset 78-109 maps to RTC offset 0-31
+    // Normal: offset 0-95 maps to RTC offset 32-127
+    // Eboot: offset 96-127 maps to RTC offset 0-31
     if (in_normal && start + total_words > RTC_NORMAL_REGION_WORDS) {
       // start is in normal but end is not -> switch to Eboot
       this->current_offset = start = RTC_NORMAL_REGION_WORDS;

esphome/components/esp8266/rtc_layout.h

@@ -1,18 +0,0 @@
-#pragma once
-
-#ifdef USE_ESP8266
-
-#include <cstdint>
-
-namespace esphome::esp8266 {
-
-// User RTC memory is system blocks 64-191, one 4-byte word each. preferences.cpp owns the first
-// words, crash_handler.cpp the last; const.py hands preferences.cpp its region sizes.
-static constexpr uint32_t RTC_SYSTEM_USER_BASE = 64;
-static constexpr uint32_t RTC_USER_MEM_WORDS = 128;
-static constexpr uint32_t RTC_CRASH_WORDS = 18;
-static constexpr uint32_t RTC_CRASH_BASE = RTC_SYSTEM_USER_BASE + RTC_USER_MEM_WORDS - RTC_CRASH_WORDS;
-
-}  // namespace esphome::esp8266
-
-#endif  // USE_ESP8266

esphome/components/ezo/ezo.h

@@ -3,12 +3,11 @@
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
-#include "esphome/core/log.h"
 #include <deque>
 
 namespace esphome::ezo {
 
-ESPHOME_LOG_TAG(TAG, "ezo.sensor");
+static const char *const TAG = "ezo.sensor";
 
 enum EzoCommandType : uint8_t {
   EZO_READ = 0,

esphome/components/file/image.py

@@ -330,9 +330,7 @@ async def write_image(
         if byte_order is not None:
             # Check for valid type has already been done in validate_settings
             encoder.set_big_endian(byte_order == "BIG_ENDIAN")
-        pixels = encoder.convert(
-            image.resize((width, height)), path
-        ).get_flattened_data()
+        pixels = encoder.convert(image.resize((width, height)), path).getdata()
         for row in range(height):
             for col in range(width):
                 encoder.encode(pixels[row * width + col])

esphome/components/filter_lifetime/__init__.py

@@ -1,2 +0,0 @@
-CODEOWNERS = ["@tuct"]
-DOMAIN = "filter_lifetime"

esphome/components/filter_lifetime/filter_lifetime.cpp

@@ -1,112 +0,0 @@
-#include "filter_lifetime.h"
-#include "esphome/core/application.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/log.h"
-
-#include <algorithm>
-#include <cmath>
-
-namespace esphome::filter_lifetime {
-
-ESPHOME_LOG_TAG(TAG, "filter_lifetime");
-
-static constexpr uint32_t SECONDS_PER_HOUR = 3600;
-static constexpr float MINUTES_PER_DAY = 24.0f * 60.0f;
-
-void FilterLifetime::setup() {
-  this->pref_ = this->make_entity_preference<uint32_t>();
-  this->pref_.load(&this->runtime_seconds_);
-  this->last_update_ = millis();
-  this->publish_values_();
-}
-
-void FilterLifetime::update() {
-  const uint32_t now = App.get_loop_component_start_time();
-  const uint32_t elapsed_ms = now - this->last_update_;
-  this->last_update_ = now;
-
-  if (this->get_is_on_()) {
-    float speed = this->get_current_speed_();
-    if (std::isnan(speed))
-      speed = 0.0f;
-    speed = std::clamp(speed, 0.0f, 100.0f);
-    const uint32_t prev_hours = this->runtime_seconds_ / SECONDS_PER_HOUR;
-    this->carry_ms_ += static_cast<uint32_t>(elapsed_ms * (speed / 100.0f));
-    this->runtime_seconds_ += this->carry_ms_ / 1000;
-    this->carry_ms_ %= 1000;
-    // Save once per hour of runtime (and in on_shutdown): every save erases a flash sector on ESP8266.
-    if (this->runtime_seconds_ / SECONDS_PER_HOUR != prev_hours)
-      this->pref_.save(&this->runtime_seconds_);
-    ESP_LOGV(TAG, "Elapsed %" PRIu32 " ms at %.0f%%, runtime %" PRIu32 " s", elapsed_ms, speed, this->runtime_seconds_);
-  }
-  this->publish_values_();
-}
-
-void FilterLifetime::publish_values_() {
-  const float runtime_minutes = this->runtime_seconds_ / 60.0f;
-  const float max_minutes = this->max_lifetime_minutes_;
-  const float remaining_minutes = std::max(0.0f, max_minutes - runtime_minutes);
-  this->publish_state(100.0f * remaining_minutes / max_minutes);
-  if (this->runtime_hours_sensor_ != nullptr)
-    this->runtime_hours_sensor_->publish_state(runtime_minutes / 60.0f);
-  if (this->remaining_days_sensor_ != nullptr)
-    this->remaining_days_sensor_->publish_state(remaining_minutes / MINUTES_PER_DAY);
-}
-
-void FilterLifetime::on_shutdown() { this->pref_.save(&this->runtime_seconds_); }
-
-void FilterLifetime::reset_filter() {
-  this->runtime_seconds_ = 0;
-  this->carry_ms_ = 0;
-  this->pref_.save(&this->runtime_seconds_);
-  this->publish_values_();
-  ESP_LOGI(TAG, "Filter lifetime reset");
-}
-
-bool FilterLifetime::get_is_on_() {
-#ifdef USE_BINARY_SENSOR
-  // Reads false until the sensor first publishes, so nothing accumulates before then.
-  if (this->is_on_sensor_ != nullptr)
-    return this->is_on_sensor_->state;
-#endif
-  if (this->is_on_lambda_ != nullptr)
-    return this->is_on_lambda_();
-  return true;
-}
-
-float FilterLifetime::get_current_speed_() {
-  if (this->current_speed_sensor_ != nullptr)
-    return this->current_speed_sensor_->state;  // NaN before the first publish, treated as 0
-  if (this->current_speed_lambda_ != nullptr)
-    return this->current_speed_lambda_();
-  return 100.0f;
-}
-
-void FilterLifetime::dump_config() {
-  LOG_SENSOR("", "Filter Lifetime", this);
-  ESP_LOGCONFIG(TAG,
-                "  Max lifetime: %" PRIu32 " min (%.1f days)\n"
-                "  Runtime: %.1f h",
-                this->max_lifetime_minutes_, this->max_lifetime_minutes_ / MINUTES_PER_DAY,
-                this->runtime_seconds_ / 3600.0f);
-#ifdef USE_BINARY_SENSOR
-  if (this->is_on_sensor_ != nullptr) {
-    LOG_BINARY_SENSOR("  ", "Is-on sensor", this->is_on_sensor_);
-  } else
-#endif
-  {
-    ESP_LOGCONFIG(TAG, "  Is-on: %s",
-                  this->is_on_lambda_ != nullptr ? LOG_STR_LITERAL("lambda") : LOG_STR_LITERAL("always"));
-  }
-  if (this->current_speed_sensor_ != nullptr) {
-    LOG_SENSOR("  ", "Speed sensor", this->current_speed_sensor_);
-  } else {
-    ESP_LOGCONFIG(TAG, "  Speed: %s",
-                  this->current_speed_lambda_ != nullptr ? LOG_STR_LITERAL("lambda") : LOG_STR_LITERAL("100%"));
-  }
-  LOG_SENSOR("  ", "Runtime hours", this->runtime_hours_sensor_);
-  LOG_SENSOR("  ", "Remaining days", this->remaining_days_sensor_);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-}  // namespace esphome::filter_lifetime

esphome/components/filter_lifetime/filter_lifetime.h

@@ -1,50 +0,0 @@
-#pragma once
-
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#ifdef USE_BINARY_SENSOR
-#include "esphome/components/binary_sensor/binary_sensor.h"
-#endif
-
-namespace esphome::filter_lifetime {
-
-class FilterLifetime : public sensor::Sensor, public PollingComponent {
- public:
-  void setup() override;
-  void update() override;
-  void dump_config() override;
-  void on_shutdown() override;
-  void reset_filter();
-
-  void set_max_lifetime(uint32_t minutes) { this->max_lifetime_minutes_ = minutes; }
-  void set_is_on_lambda(bool (*is_on)()) { this->is_on_lambda_ = is_on; }
-#ifdef USE_BINARY_SENSOR
-  void set_is_on_sensor(binary_sensor::BinarySensor *sensor) { this->is_on_sensor_ = sensor; }
-#endif
-  void set_current_speed_lambda(float (*speed)()) { this->current_speed_lambda_ = speed; }
-  void set_current_speed_sensor(sensor::Sensor *sensor) { this->current_speed_sensor_ = sensor; }
-  void set_runtime_hours_sensor(sensor::Sensor *sensor) { this->runtime_hours_sensor_ = sensor; }
-  void set_remaining_days_sensor(sensor::Sensor *sensor) { this->remaining_days_sensor_ = sensor; }
-
- protected:
-  bool get_is_on_();
-  float get_current_speed_();
-  void publish_values_();
-
-  bool (*is_on_lambda_)(){nullptr};
-  float (*current_speed_lambda_)(){nullptr};
-#ifdef USE_BINARY_SENSOR
-  binary_sensor::BinarySensor *is_on_sensor_{nullptr};
-#endif
-  sensor::Sensor *current_speed_sensor_{nullptr};
-  sensor::Sensor *runtime_hours_sensor_{nullptr};
-  sensor::Sensor *remaining_days_sensor_{nullptr};
-  ESPPreferenceObject pref_;
-  uint32_t max_lifetime_minutes_{0};
-  uint32_t last_update_{0};
-  uint32_t runtime_seconds_{0};  // Speed-weighted running time, persisted
-  uint32_t carry_ms_{0};         // Weighted milliseconds not yet counted as a second
-};
-
-}  // namespace esphome::filter_lifetime

esphome/components/filter_lifetime/sensor.py

@@ -1,94 +0,0 @@
-from esphome import automation
-import esphome.codegen as cg
-from esphome.components import binary_sensor, sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    DEVICE_CLASS_DURATION,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_HOUR,
-    UNIT_PERCENT,
-)
-from esphome.types import ConfigType
-
-CONF_MAX_LIFETIME = "max_lifetime"
-CONF_IS_ON = "is_on"
-CONF_IS_ON_SENSOR = "is_on_sensor"
-CONF_CURRENT_SPEED = "current_speed"
-CONF_CURRENT_SPEED_SENSOR = "current_speed_sensor"
-CONF_RUNTIME_HOURS = "runtime_hours"
-CONF_REMAINING_DAYS = "remaining_days"
-UNIT_DAY = "d"
-
-filter_lifetime_ns = cg.esphome_ns.namespace("filter_lifetime")
-FilterLifetime = filter_lifetime_ns.class_(
-    "FilterLifetime", sensor.Sensor, cg.PollingComponent
-)
-
-CONFIG_SCHEMA = cv.All(
-    sensor.sensor_schema(
-        FilterLifetime,
-        unit_of_measurement=UNIT_PERCENT,
-        accuracy_decimals=2,
-        icon="mdi:air-filter",
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(
-        {
-            cv.Required(CONF_MAX_LIFETIME): cv.All(
-                cv.positive_time_period_minutes,
-                cv.Range(min=cv.TimePeriod(minutes=1)),
-            ),
-            cv.Optional(CONF_IS_ON): cv.returning_lambda,
-            cv.Optional(CONF_IS_ON_SENSOR): cv.use_id(binary_sensor.BinarySensor),
-            cv.Optional(CONF_CURRENT_SPEED): cv.returning_lambda,
-            cv.Optional(CONF_CURRENT_SPEED_SENSOR): cv.use_id(sensor.Sensor),
-            cv.Optional(CONF_RUNTIME_HOURS): sensor.sensor_schema(
-                unit_of_measurement=UNIT_HOUR,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_DURATION,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-                icon="mdi:timer-outline",
-            ),
-            cv.Optional(CONF_REMAINING_DAYS): sensor.sensor_schema(
-                unit_of_measurement=UNIT_DAY,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_DURATION,
-                icon="mdi:calendar-clock",
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s")),
-    cv.has_at_most_one_key(CONF_IS_ON, CONF_IS_ON_SENSOR),
-    cv.has_at_most_one_key(CONF_CURRENT_SPEED, CONF_CURRENT_SPEED_SENSOR),
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-
-    cg.add(var.set_max_lifetime(config[CONF_MAX_LIFETIME]))
-
-    if (is_on := config.get(CONF_IS_ON)) is not None:
-        cg.add(var.set_is_on_lambda(await cg.templatable(is_on, [], bool)))
-    elif (is_on_sensor := config.get(CONF_IS_ON_SENSOR)) is not None:
-        cg.add(var.set_is_on_sensor(await cg.get_variable(is_on_sensor)))
-
-    if (current_speed := config.get(CONF_CURRENT_SPEED)) is not None:
-        cg.add(
-            var.set_current_speed_lambda(await cg.templatable(current_speed, [], float))
-        )
-    elif (speed_sensor := config.get(CONF_CURRENT_SPEED_SENSOR)) is not None:
-        cg.add(var.set_current_speed_sensor(await cg.get_variable(speed_sensor)))
-
-    sensors = sensor.sub_sensors(config)
-    await sensors(CONF_RUNTIME_HOURS, var.set_runtime_hours_sensor)
-    await sensors(CONF_REMAINING_DAYS, var.set_remaining_days_sensor)
-
-
-automation.register_apply_action(
-    "filter_lifetime.reset_filter",
-    cv.Schema({cv.GenerateID(): cv.use_id(FilterLifetime)}),
-    automation.ApplyCall("reset_filter()"),
-)

esphome/components/friedrich/__init__.py

@@ -1 +0,0 @@
-DOMAIN = "friedrich"

esphome/components/friedrich/climate.py

@@ -1,32 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import climate_ir, remote_base
-import esphome.config_validation as cv
-from esphome.const import CONF_MODEL, CONF_SENSOR
-from esphome.types import ConfigType
-
-AUTO_LOAD = ["climate_ir"]
-CODEOWNERS = ["@rwrozelle"]
-
-friedrich_ns = cg.esphome_ns.namespace("friedrich")
-FriedrichClimate = friedrich_ns.class_("FriedrichClimate", climate_ir.ClimateIR)
-
-Model = friedrich_ns.enum("Model", is_class=True)
-MODELS = {
-    "MW12Y3H": Model.MODEL_MW12Y3H,
-}
-
-CONFIG_SCHEMA = climate_ir.climate_ir_with_receiver_schema(FriedrichClimate).extend(
-    {
-        cv.Optional(CONF_MODEL, default="MW12Y3H"): cv.enum(MODELS, upper=True),
-        # The unit works in Fahrenheit, so a Celsius temperature sensor cannot feed it
-        cv.Optional(CONF_SENSOR): cv.invalid(
-            "'sensor' is not supported by the Friedrich climate component"
-        ),
-    }
-)
-
-
-async def to_code(config: ConfigType) -> None:
-    remote_base.request_protocol("aeha")  # used from C++
-    var = await climate_ir.new_climate_ir(config)
-    cg.add(var.set_model(config[CONF_MODEL]))

esphome/components/friedrich/friedrich.cpp

@@ -1,234 +0,0 @@
-#include "friedrich.h"
-
-#include <cmath>
-
-#include "esphome/components/remote_base/aeha_protocol.h"
-#include "esphome/core/hal.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome::friedrich {
-// clang-format off
-/*
-* MW12Y3H - Currently the only supported model. Model field is retained to allow future per-model code differentiation.
-* AEHA
-* Byte0  Fixed = 0x00
-* Byte1  Fixed = 0x08
-* Byte2  Fixed = 0x08
-* Byte3  Command: Move Louver = 0x36 Off = 0x40, else Fixed = 0x7F
-* Byte4  Checksum when command, else Fixed = 0x90
-* Byte5  N/A when command, else Fixed = 0x0C
-* Byte6  N/A when command, else Temp(F), add 0x80 for On
-* Byte7  N/A when command, else Mode (Min Heat = 0xD0 and Coil Dry = 0x10 are not exposed)
-* Byte8  N/A when command, else Fan, add 0x08 for Vertical Swing
-* Byte9 N/A when command, else Fixed = 0x00 // not interested
-* Byte10 N/A when command, else Fixed = 0x00 // not interested
-* Byte11 N/A when command, else Fixed = 0x00 // not interested
-* Byte12 N/A when command, else Economy (On = 0x00, Off = 0x04)
-* Byte13 N/A when command, else CheckSum
-*/
-// clang-format on
-ESPHOME_LOG_TAG(TAG, "friedrich");
-
-static constexpr uint8_t TEMP_MIN_NOT_HEAT = 64;
-static constexpr uint8_t TEMP_DEFAULT = 72;
-static constexpr uint8_t STATE_MESSAGE_LENGTH = FriedrichClimate::STATE_MESSAGE_LENGTH;
-static constexpr uint8_t STATE_MESSAGE_LENGTH_UTIL = 5;
-static constexpr uint16_t CARRIER_ADDRESS = 0x28C6;
-static constexpr uint32_t CARRIER_FREQUENCY = 38000;
-
-static constexpr uint8_t BYTE3_POWER_OFF = 0x40;
-static constexpr uint8_t BYTE6_POWER_ON = 0x80;
-static constexpr uint8_t BYTE7_MODE_AUTO = 0x00;
-static constexpr uint8_t BYTE8_FAN_AUTO = 0x00;
-static constexpr uint8_t BYTE8_FAN_SWING = 0x08;
-
-// Every state frame: power on, economy off; bytes 6, 7, 8 and 13 are patched per state
-static constexpr uint8_t STATE_TEMPLATE[STATE_MESSAGE_LENGTH] PROGMEM = {
-    0x00, 0x08, 0x08, 0x7F, 0x90, 0x0C, BYTE6_POWER_ON, BYTE7_MODE_AUTO, BYTE8_FAN_AUTO, 0x00, 0x00, 0x00, 0x04, 0x00};
-// The off command, including its checksum (255 - byte 3)
-static constexpr uint8_t OFF_FRAME[STATE_MESSAGE_LENGTH_UTIL] PROGMEM = {0x00, 0x08, 0x08, BYTE3_POWER_OFF,
-                                                                         255 - BYTE3_POWER_OFF};
-
-struct Code {
-  uint8_t value;  // a climate enum, all of which are uint8_t
-  uint8_t code;
-};
-static constexpr Code MODES[] PROGMEM = {
-    {climate::CLIMATE_MODE_HEAT_COOL, BYTE7_MODE_AUTO},
-    {climate::CLIMATE_MODE_COOL, 0x80},
-    {climate::CLIMATE_MODE_DRY, 0x40},
-    {climate::CLIMATE_MODE_FAN_ONLY, 0xC0},
-    {climate::CLIMATE_MODE_HEAT, 0x20},
-};
-static constexpr Code FANS[] PROGMEM = {
-    {climate::CLIMATE_FAN_AUTO, BYTE8_FAN_AUTO}, {climate::CLIMATE_FAN_HIGH, 0x80},
-    {climate::CLIMATE_FAN_MEDIUM, 0x40},         {climate::CLIMATE_FAN_LOW, 0xC0},
-    {climate::CLIMATE_FAN_QUIET, 0x20},
-};
-
-// The entry whose value (or code) matches key. Entries are copied out of PROGMEM.
-template<size_t N> static optional<Code> find_entry(const Code (&table)[N], uint8_t key, bool match_code) {
-  for (const Code &slot : table) {
-    Code entry;
-    progmem_memcpy(&entry, &slot, sizeof(entry));
-    if ((match_code ? entry.code : entry.value) == key)
-      return entry;
-  }
-  return {};
-}
-
-// The temperature code is the 4-bit reversal of (F - TEMP_MIN) / TEMP_STEP; the mapping is its own inverse.
-static uint8_t reverse_nibble(uint8_t value) { return reverse_bits(value) >> 4; }
-
-static bool matches_template(const uint8_t *data, uint8_t from, uint8_t to) {
-  for (uint8_t i = from; i <= to; i++) {
-    if (data[i] != progmem_read_byte(&STATE_TEMPLATE[i]))
-      return false;
-  }
-  return true;
-}
-
-/*
- * https://gist.github.com/GeorgeDewar/11171561
- * 1. Reverse (flip) bytes 6 - 13)
- * 2. Sum those bytes
- * 3. (208 - sum) % 256
- * 4. Reverse (flip) bytes of result
- */
-static uint8_t checksum_state(const uint8_t *data) {
-  uint8_t sum = 0;
-  for (uint8_t i = 6; i < STATE_MESSAGE_LENGTH - 1; ++i) {
-    sum += reverse_bits(data[i]);
-  }
-  return reverse_bits(static_cast<uint8_t>(208 - sum));
-}
-
-static const LogString *model_to_string(Model model) {
-  switch (model) {
-    case Model::MODEL_MW12Y3H:
-    default:
-      return LOG_STR("MW12Y3H");
-  }
-}
-
-climate::ClimateTraits FriedrichClimate::traits() {
-  auto traits = ClimateIR::traits();
-  traits.set_temperature_unit(TemperatureUnit::FAHRENHEIT);
-  return traits;
-}
-
-void FriedrichClimate::setup() {
-  ClimateIR::setup();
-  // The base class defaults assume Celsius. This also discards a value saved in Celsius by an earlier version.
-  if (std::isnan(this->target_temperature) || this->target_temperature < TEMP_MIN) {
-    this->target_temperature = TEMP_DEFAULT;
-  }
-  this->target_temperature = std::min<float>(this->target_temperature, TEMP_MAX);
-}
-
-void FriedrichClimate::dump_config() {
-  // ClimateIR::dump_config() is not called: it prints the temperature range in Celsius
-  LOG_CLIMATE("", "Friedrich Climate", this);
-  ESP_LOGCONFIG(TAG,
-                "  Temperature range: %u to %u °F\n"
-                "  Model: %s",
-                TEMP_MIN, TEMP_MAX, LOG_STR_ARG(model_to_string(this->model_)));
-}
-
-void FriedrichClimate::transmit_state() {
-  if (this->mode == climate::CLIMATE_MODE_OFF) {
-    this->transmit_off_();
-    return;
-  }
-
-  ESP_LOGV(TAG, "Transmit state");
-
-  // Snap to what the unit accepts (even values, 64°F minimum unless heating) and store it,
-  // so the state published after this call matches the frame sent.
-  const uint8_t effective_min = this->mode == climate::CLIMATE_MODE_HEAT ? TEMP_MIN : TEMP_MIN_NOT_HEAT;
-  uint8_t temperature = (uint8_t) roundf(clamp<float>(this->target_temperature, effective_min, TEMP_MAX));
-  temperature += temperature % 2;
-  this->target_temperature = temperature;
-
-  const auto mode = find_entry(MODES, this->mode, false);
-  const auto fan = find_entry(FANS, this->fan_mode.value_or(climate::CLIMATE_FAN_AUTO), false);
-
-  uint8_t frame[STATE_MESSAGE_LENGTH];
-  progmem_memcpy(frame, STATE_TEMPLATE, sizeof(frame));
-  frame[6] |= reverse_nibble((temperature - TEMP_MIN) / TEMP_STEP);
-  frame[7] = mode.has_value() ? mode->code : BYTE7_MODE_AUTO;
-  frame[8] = fan.has_value() ? fan->code : BYTE8_FAN_AUTO;
-  if (this->swing_mode != climate::CLIMATE_SWING_OFF)
-    frame[8] |= BYTE8_FAN_SWING;
-  frame[STATE_MESSAGE_LENGTH - 1] = checksum_state(frame);
-
-  this->transmit_(frame, sizeof(frame));
-}
-
-void FriedrichClimate::transmit_off_() {
-  ESP_LOGV(TAG, "Transmit off");
-
-  uint8_t frame[STATE_MESSAGE_LENGTH_UTIL];
-  progmem_memcpy(frame, OFF_FRAME, sizeof(frame));
-  this->transmit_(frame, sizeof(frame));
-}
-
-void FriedrichClimate::transmit_(const uint8_t *data, uint8_t len) {
-  ESP_LOGV(TAG, "Transmit message");
-
-  auto transmit = this->transmitter_->transmit();
-  auto *dst = transmit.get_data();
-  dst->set_carrier_frequency(CARRIER_FREQUENCY);
-  remote_base::AEHAProtocol().encode(dst, CARRIER_ADDRESS, data, len);
-  transmit.perform();
-}
-
-bool FriedrichClimate::on_receive(remote_base::RemoteReceiveData src) {
-  ESP_LOGV(TAG, "Received message");
-  const auto odata = remote_base::AEHAProtocol().decode(src);
-  if (!odata.has_value())
-    return false;
-  const auto &d = odata->data;
-  // Other vendors also use AEHA; only accept frames with our address and fixed header bytes.
-  if (odata->address != CARRIER_ADDRESS || d.size() < STATE_MESSAGE_LENGTH_UTIL || !matches_template(d.data(), 0, 2))
-    return false;
-
-  if (d.size() == STATE_MESSAGE_LENGTH_UTIL) {
-    // Not looking for other types of messages
-    if (d[3] != BYTE3_POWER_OFF || d[4] != 255 - d[3])
-      return false;
-    ESP_LOGV(TAG, "Received off message");
-    this->mode = climate::CLIMATE_MODE_OFF;
-    this->publish_state();
-    return true;
-  }
-
-  if (d.size() != STATE_MESSAGE_LENGTH || d[STATE_MESSAGE_LENGTH - 1] != checksum_state(d.data()) ||
-      !matches_template(d.data(), 3, 5))
-    return false;
-
-  // Ignore frames with a mode this component does not expose (e.g. MIN_HEAT, COIL_DRY)
-  const auto mode = find_entry(MODES, d[7], true);
-  if (!mode.has_value()) {
-    ESP_LOGV(TAG, "Ignoring unknown mode 0x%02X", d[7]);
-    return false;
-  }
-  this->mode = static_cast<climate::ClimateMode>(mode->value);
-
-  // State frames always carry the power-on flag in bit 7 (power off is the separate 5-byte frame), so it is
-  // stripped rather than acted on
-  const uint8_t temp_code = d[6] & ~BYTE6_POWER_ON;
-  const uint8_t temp_index = reverse_nibble(temp_code);
-  if (temp_code <= 0x0F && temp_index <= (TEMP_MAX - TEMP_MIN) / TEMP_STEP)
-    this->target_temperature = TEMP_MIN + temp_index * TEMP_STEP;
-
-  this->swing_mode = (d[8] & BYTE8_FAN_SWING) ? climate::CLIMATE_SWING_VERTICAL : climate::CLIMATE_SWING_OFF;
-  const auto fan = find_entry(FANS, d[8] & ~BYTE8_FAN_SWING, true);
-  this->fan_mode = fan.has_value() ? static_cast<climate::ClimateFanMode>(fan->value) : climate::CLIMATE_FAN_AUTO;
-
-  this->publish_state();
-  return true;
-}
-
-}  // namespace esphome::friedrich

esphome/components/friedrich/friedrich.h

@@ -1,47 +0,0 @@
-#pragma once
-
-#include "esphome/components/climate_ir/climate_ir.h"
-
-namespace esphome::friedrich {
-
-// Extension point for other units: add new models here and branch on model_ where they differ.
-// The default must stay MW12Y3H so existing configurations do not change.
-enum class Model : uint8_t {
-  MODEL_MW12Y3H,  // MW12Y3H built from a remote that only provided Fahrenheit
-};
-
-class FriedrichClimate : public climate_ir::ClimateIR {
- public:
-  // The unit reports temperatures in Fahrenheit (see traits()); the unit only accepts even values.
-  static constexpr uint8_t TEMP_MIN = 60;  // actually 64 for anything but heating
-  static constexpr uint8_t TEMP_MAX = 88;
-  static constexpr uint8_t TEMP_STEP = 2;
-  static constexpr uint8_t STATE_MESSAGE_LENGTH = 14;
-
-  FriedrichClimate()
-      : ClimateIR(TEMP_MIN, TEMP_MAX, TEMP_STEP, true, true,
-                  {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_HIGH, climate::CLIMATE_FAN_MEDIUM,
-                   climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_QUIET},
-                  {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
-
-  void set_model(Model model) { this->model_ = model; }
-
- protected:
-  void setup() override;
-  void dump_config() override;
-  climate::ClimateTraits traits() override;
-  /// Transmit via IR the state of this climate controller.
-  void transmit_state() override;
-  /// Transmit via IR power off command.
-  void transmit_off_();
-
-  /// Parse incoming message
-  bool on_receive(remote_base::RemoteReceiveData src) override;
-
-  /// Transmit message as IR pulses
-  void transmit_(const uint8_t *data, uint8_t len);
-
-  Model model_{Model::MODEL_MW12Y3H};
-};
-
-}  // namespace esphome::friedrich

esphome/components/fusb302b/__init__.py

@@ -1,2 +0,0 @@
-CODEOWNERS = ["@remcom"]
-DOMAIN = "fusb302b"

esphome/components/fusb302b/pd.cpp

@@ -1,330 +0,0 @@
-#include "pd.h"
-
-#include <cstring>
-
-#include "esphome/core/hal.h"
-#include "esphome/core/log.h"
-
-namespace esphome::fusb302b {
-
-ESPHOME_LOG_TAG(TAG, "fusb302b.pd");
-
-static constexpr uint32_t AMS_TIMEOUT_MS = 2000;
-// tSinkRequest: delay before repeating a request that the source answered with Wait
-static constexpr uint32_t SINK_REQUEST_MS = 100;
-static constexpr uint8_t MAX_WAIT_RETRIES = 10;
-
-// USB PD 6.4.1.3.1 Sink Fixed Supply Power Data Object flags; only the first (5 V) object carries them
-static constexpr uint32_t SINK_PDO_HIGHER_CAPABILITY = 1u << 28;
-static constexpr uint32_t SINK_PDO_USB_COMMS_CAPABLE = 1u << 26;
-// Operational current advertised for every sink object: 3 A (300 x 10 mA)
-static constexpr uint16_t SINK_PDO_CURRENT = 300;
-
-// USB PD 6.4.1.2.3 Source Fixed Supply Power Data Object; other PDO types only report their type
-static PdContract parse_pdo(uint32_t pdo) {
-  PdContract info{};
-  info.type = static_cast<PdPdoType>(pdo >> 30);
-  if (info.type == PD_PDO_TYPE_FIXED_SUPPLY) {
-    info.max_v = (pdo >> 10) & 0x3FF;
-    info.max_i = pdo & 0x3FF;
-  }
-  return info;
-}
-
-// USB PD 6.4.1.3.1 Sink Fixed Supply Power Data Object; voltage in 50 mV units, current in 10 mA units
-static constexpr uint32_t sink_fixed_pdo(uint16_t voltage, uint16_t current) {
-  return (static_cast<uint32_t>(PD_PDO_TYPE_FIXED_SUPPLY) << 30) | (static_cast<uint32_t>(voltage & 0x3FF) << 10) |
-         (current & 0x3FF);
-}
-
-void PdMsg::set_header(uint16_t header) {
-  this->type = header & 0x1F;
-  this->spec_rev = static_cast<PdSpecRevision>((header >> 6) & 0x3);
-  this->id = (header >> 9) & 0x7;
-  this->num_of_obj = (header >> 12) & 0x7;
-  this->extended = (header >> 15) & 0x1;
-}
-
-uint16_t PdMsg::get_coded_header() const {
-  // Data role UFP (bit 5 = 0), power role sink (bit 8 = 0)
-  return static_cast<uint16_t>(this->type & 0x1F) | (static_cast<uint16_t>(this->spec_rev) << 6) |
-         (static_cast<uint16_t>(this->id & 0x7) << 9) | (static_cast<uint16_t>(this->num_of_obj & 0x7) << 12) |
-         (static_cast<uint16_t>(this->extended) << 15);
-}
-
-PdMsg PowerDelivery::make_control_msg_(PdControlMsgType type) const {
-  PdMsg msg;
-  msg.type = type;
-  msg.id = this->msg_counter_ % 8;
-  return msg;
-}
-
-PdMsg PowerDelivery::make_data_msg_(PdDataMsgType type, const uint32_t *objects, uint8_t len) const {
-  PdMsg msg;
-  msg.type = type;
-  msg.id = this->msg_counter_ % 8;
-  msg.num_of_obj = len;
-  memcpy(msg.data_objects, objects, len * sizeof(uint32_t));
-  return msg;
-}
-
-void PowerDelivery::reset_protocol_() {
-  this->last_received_msg_id_ = 255;
-  this->msg_counter_ = 0;
-  this->active_ams_ = false;
-  this->ps_rdy_expected_ = false;
-  this->retry_request_pending_ = false;
-  this->wait_retries_ = 0;
-}
-
-void PowerDelivery::set_state_(PdState state) {
-  if (this->state_.exchange(state) != state)
-    this->on_state_changed();
-}
-
-void PowerDelivery::set_contract_(const PdContract &contract) {
-  this->accepted_contract_ = contract;
-  const uint32_t packed = PackedContract::from(contract).value;
-  if (this->contract_.exchange(packed) != packed)
-    this->on_state_changed();
-}
-
-void PowerDelivery::clear_contract_() {
-  this->accepted_contract_ = {};
-  if (this->contract_.exchange(0) != 0)
-    this->on_state_changed();
-}
-
-void PowerDelivery::set_state_and_contract_(PdState state, const PdContract &contract) {
-  this->accepted_contract_ = contract;
-  const uint32_t packed = PackedContract::from(contract).value;
-  // The contract is stored first, so a reader that sees the new state also sees the new contract
-  const bool contract_changed = this->contract_.exchange(packed) != packed;
-  const bool state_changed = this->state_.exchange(state) != state;
-  if (contract_changed || state_changed)
-    this->on_state_changed();
-}
-
-void PowerDelivery::set_ams_(bool active) {
-  this->active_ams_ = active;
-  // A new sequence has no accepted request yet, and an ended one can no longer complete
-  this->ps_rdy_expected_ = false;
-  if (active)
-    this->ams_start_ = millis();
-}
-
-bool PowerDelivery::check_ams_() {
-  if (this->active_ams_ && millis() - this->ams_start_ > AMS_TIMEOUT_MS)
-    this->set_ams_(false);
-  return this->active_ams_;
-}
-
-void PowerDelivery::check_request_retry_() {
-  if (!this->retry_request_pending_ || millis() - this->wait_received_ms_ < SINK_REQUEST_MS)
-    return;
-  if (this->send_request_()) {
-    this->retry_request_pending_ = false;
-  } else if (this->wait_retries_ < MAX_WAIT_RETRIES) {
-    // Try again after another tSinkRequest; failed attempts count against the same limit as Wait replies
-    this->wait_retries_++;
-    this->wait_received_ms_ = millis();
-  } else {
-    ESP_LOGW(TAG, "Giving up repeating the request");
-    this->retry_request_pending_ = false;
-    this->request_failed_();
-  }
-}
-
-bool PowerDelivery::send_request_() {
-  this->set_ams_(true);
-  if (this->send_message(this->make_data_msg_(PD_DATA_REQUEST, &this->last_rdo_, 1)))
-    return true;
-  ESP_LOGW(TAG, "Sending the request failed");
-  this->set_ams_(false);
-  return false;
-}
-
-void PowerDelivery::request_failed_() {
-  // A contract already in place stays valid. Without one, report that negotiation is over at default power.
-  if (this->state_ == PdState::PD_STATE_DEFAULT_CONTRACT)
-    this->set_state_(PdState::PD_STATE_PD_TIMEOUT);
-}
-
-void PowerDelivery::check_transition_timeout_() {
-  // The AMS that sent the request only ends on PS_RDY, so an ended AMS while in transition means a timeout
-  if (this->state_ != PdState::PD_STATE_TRANSITION || this->check_ams_())
-    return;
-  ESP_LOGW(TAG, "Source did not report the new supply ready, falling back to default power");
-  this->set_state_and_contract_(PdState::PD_STATE_DEFAULT_CONTRACT, DEFAULT_CONTRACT);
-  this->on_transition_timeout();
-}
-
-void PowerDelivery::handle_transmit_failed_() {
-  // USB PD 6.12.2.2: the counter also moves on after a failed transmission. The source may have received the
-  // message and only its GoodCRC was lost, so reusing the MessageID would make it drop the next one as a repeat.
-  ESP_LOGD(TAG, "Message %u not acknowledged", this->msg_counter_ % 8);
-  this->msg_counter_++;
-}
-
-void PowerDelivery::handle_message_(const PdMsg &msg) {
-  if (msg.num_of_obj == 0 && msg.type == PD_CNTRL_GOODCRC) {
-    // A GoodCRC carries the MessageID it acknowledges; a duplicate or stray one must not advance the counter
-    if (msg.id != this->msg_counter_ % 8) {
-      ESP_LOGD(TAG, "Ignoring GoodCRC for MessageID %u, expected %u", msg.id, this->msg_counter_ % 8);
-      return;
-    }
-    // Our last message was received, so the next one gets a new MessageID
-    this->msg_counter_++;
-    return;
-  }
-  // Soft_Reset always has MessageID 0, so it must not be dropped as a retransmission of the last message
-  if (msg.num_of_obj == 0 && msg.type == PD_CNTRL_SOFT_RESET) {
-    this->handle_soft_reset_(msg);
-    return;
-  }
-  // Retransmissions repeat the MessageID of a message that was already handled
-  if (msg.id == this->last_received_msg_id_)
-    return;
-  this->last_received_msg_id_ = msg.id;
-
-  if (msg.num_of_obj == 0) {
-    this->handle_control_message_(msg);
-  } else {
-    this->handle_data_message_(msg);
-  }
-}
-
-void PowerDelivery::handle_data_message_(const PdMsg &msg) {
-  if (msg.extended || msg.type != PD_DATA_SOURCE_CAP) {
-    // BIST and Vendor_Defined messages must not be answered with Reject, so unsupported data messages are ignored
-    ESP_LOGV(TAG, "Ignoring data message type %u%s", msg.type,
-             msg.extended ? LOG_STR_LITERAL(" (extended)") : LOG_STR_LITERAL(""));
-    return;
-  }
-  this->on_source_caps_received();
-  this->respond_to_source_caps_(msg);
-}
-
-void PowerDelivery::handle_control_message_(const PdMsg &msg) {
-  switch (msg.type) {
-    case PD_CNTRL_ACCEPT:
-      if (!this->check_ams_()) {
-        ESP_LOGD(TAG, "Ignoring Accept outside a request");
-        break;
-      }
-      this->ps_rdy_expected_ = true;
-      if (this->requested_contract_ != this->accepted_contract_)
-        this->set_state_and_contract_(PdState::PD_STATE_TRANSITION, this->requested_contract_);
-      break;
-    case PD_CNTRL_PS_RDY:
-      // check_ams_() first, so a PS_RDY that arrives after the sequence timed out is ignored too
-      if (!this->check_ams_() || !this->ps_rdy_expected_) {
-        ESP_LOGD(TAG, "Ignoring PS_RDY without an accepted request");
-        break;
-      }
-      this->set_ams_(false);
-      this->set_state_(PdState::PD_STATE_EXPLICIT_CONTRACT);
-      break;
-    case PD_CNTRL_REJECT:
-      if (!this->check_ams_()) {
-        ESP_LOGD(TAG, "Ignoring Reject outside a request");
-        break;
-      }
-      ESP_LOGW(TAG, "Source rejected the request");
-      this->set_ams_(false);
-      this->request_failed_();
-      break;
-    case PD_CNTRL_WAIT:
-      if (!this->check_ams_()) {
-        ESP_LOGD(TAG, "Ignoring Wait outside a request");
-        break;
-      }
-      this->set_ams_(false);
-      if (this->wait_retries_ < MAX_WAIT_RETRIES) {
-        ESP_LOGD(TAG, "Source asked to wait, repeating the request");
-        this->wait_retries_++;
-        this->retry_request_pending_ = true;
-        this->wait_received_ms_ = millis();
-      } else {
-        ESP_LOGW(TAG, "Source kept answering Wait, giving up");
-        this->request_failed_();
-      }
-      break;
-    case PD_CNTRL_PING:
-    case PD_CNTRL_NOT_SUPPORTED:
-      break;
-    case PD_CNTRL_GET_SINK_CAP: {
-      // 5 V first, then the requested voltage. Higher Capability tells the source that 5 V is not enough for
-      // full operation.
-      const uint16_t request_v = this->request_voltage_ * 20;  // 50 mV units
-      uint32_t pdos[2];
-      uint8_t count = 0;
-      pdos[count++] = sink_fixed_pdo(100, SINK_PDO_CURRENT) | SINK_PDO_USB_COMMS_CAPABLE |
-                      (request_v > 100 ? SINK_PDO_HIGHER_CAPABILITY : 0);
-      if (request_v > 100)
-        pdos[count++] = sink_fixed_pdo(request_v, SINK_PDO_CURRENT);
-      this->send_message(this->make_data_msg_(PD_DATA_SINK_CAP, pdos, count));
-      break;
-    }
-    default:
-      // Messages are sent as PD 2.0, which has no Not_Supported message
-      this->send_message(this->make_control_msg_(PD_CNTRL_REJECT));
-      break;
-  }
-}
-
-void PowerDelivery::handle_soft_reset_(const PdMsg &msg) {
-  this->reset_protocol_();
-  this->last_received_msg_id_ = msg.id;
-  // If this fails the source escalates to a hard reset. The hook still runs, so the PHY starts waiting for source
-  // capabilities and recovers on its own if neither follows.
-  if (!this->send_message(this->make_control_msg_(PD_CNTRL_ACCEPT))) {
-    ESP_LOGW(TAG, "Accepting the soft reset failed");
-  }
-  // A soft reset keeps the power level, but the outcome of a transition in progress is unknown
-  if (this->state_ == PdState::PD_STATE_TRANSITION)
-    this->set_state_and_contract_(PdState::PD_STATE_DEFAULT_CONTRACT, DEFAULT_CONTRACT);
-  this->on_soft_reset_received();
-}
-
-void PowerDelivery::respond_to_source_caps_(const PdMsg &msg) {
-  // Pick the highest fixed supply PDO that does not exceed the requested voltage.
-  // The first PDO is always the 5 V fixed supply.
-  const uint16_t request_v = this->request_voltage_ * 20;  // 50 mV units
-  PdContract selected{};
-  uint8_t position = 0;  // 1-based object position, 0 = none
-  for (uint8_t idx = 0; idx < msg.num_of_obj; idx++) {
-    PdContract info = parse_pdo(msg.data_objects[idx]);
-    if (info.type != PD_PDO_TYPE_FIXED_SUPPLY)
-      continue;
-    if (position == 0 || (info.max_v <= request_v && info.max_v > selected.max_v)) {
-      selected = info;
-      position = idx + 1;
-    }
-  }
-
-  // USB PD 6.4.2 Request Data Object: no USB suspend (bit 24), USB communications capable (bit 25)
-  uint32_t rdo = (1u << 24) | (1u << 25);
-  if (position == 0) {
-    ESP_LOGW(TAG, "No usable PDO in source capabilities, requesting 5 V");
-    // Object 1 (5 V fixed supply), 300 mA maximum, 100 mA operating current
-    selected = PdContract{PD_PDO_TYPE_FIXED_SUPPLY, 100, 30};
-    position = 1;
-    rdo |= (30u << 0) | (10u << 10);
-  } else {
-    // Request the full current the source offers
-    const uint32_t current = selected.max_i;
-    rdo |= (current << 0) | (current << 10);
-  }
-  rdo |= static_cast<uint32_t>(position) << 28;
-  ESP_LOGD(TAG, "Requesting PDO %u: %.2f V", position, selected.max_v * 0.05f);
-  this->requested_contract_ = selected;
-  this->last_rdo_ = rdo;
-  this->retry_request_pending_ = false;
-  this->wait_retries_ = 0;
-  // A repeat would come too late: the source resets if it gets no Request within tSenderResponse (24-30 ms)
-  if (!this->send_request_())
-    this->request_failed_();
-}
-
-}  // namespace esphome::fusb302b

esphome/components/fusb302b/pd.h

@@ -1,178 +0,0 @@
-#pragma once
-
-#include <algorithm>
-#include <atomic>
-#include <cstddef>
-#include <cstdint>
-
-namespace esphome::fusb302b {
-
-static constexpr uint8_t PD_MAX_NUM_DATA_OBJECTS = 7;
-// Standard Power Range fixed supplies, which are the only ones this sink negotiates
-static constexpr uint8_t MIN_REQUEST_VOLTAGE = 5;
-static constexpr uint8_t MAX_REQUEST_VOLTAGE = 20;
-
-enum PdSpecRevision : uint8_t {
-  PD_SPEC_REV_1 = 0,
-  PD_SPEC_REV_2 = 1,
-  PD_SPEC_REV_3 = 2,
-};
-
-enum PdDataMsgType : uint8_t {
-  PD_DATA_SOURCE_CAP = 0x01,
-  PD_DATA_REQUEST = 0x02,
-  PD_DATA_SINK_CAP = 0x04,
-};
-
-enum PdControlMsgType : uint8_t {
-  PD_CNTRL_GOODCRC = 0x01,
-  PD_CNTRL_ACCEPT = 0x03,
-  PD_CNTRL_REJECT = 0x04,
-  PD_CNTRL_PING = 0x05,
-  PD_CNTRL_PS_RDY = 0x06,
-  PD_CNTRL_GET_SINK_CAP = 0x08,
-  PD_CNTRL_WAIT = 0x0C,
-  PD_CNTRL_SOFT_RESET = 0x0D,
-  PD_CNTRL_NOT_SUPPORTED = 0x10,
-};
-
-enum PdPdoType : uint8_t {
-  PD_PDO_TYPE_FIXED_SUPPLY = 0,
-  PD_PDO_TYPE_BATTERY = 1,
-  PD_PDO_TYPE_VARIABLE_SUPPLY = 2,
-  PD_PDO_TYPE_AUGMENTED = 3,
-};
-
-enum class PdState : uint8_t {
-  PD_STATE_DISCONNECTED,
-  /// Negotiation is over without a PD contract (no capabilities, or the request was not accepted); the source
-  /// supplies Type-C default power.
-  PD_STATE_PD_TIMEOUT,
-  PD_STATE_DEFAULT_CONTRACT,
-  PD_STATE_TRANSITION,
-  PD_STATE_EXPLICIT_CONTRACT,
-  PD_STATE_ERROR,
-};
-
-/// Returns true for the states in which a source is attached and supplying power.
-inline bool is_connected_state(PdState state) {
-  return state == PdState::PD_STATE_DEFAULT_CONTRACT || state == PdState::PD_STATE_TRANSITION ||
-         state == PdState::PD_STATE_EXPLICIT_CONTRACT || state == PdState::PD_STATE_PD_TIMEOUT;
-}
-
-struct PdContract {
-  PdPdoType type{PD_PDO_TYPE_FIXED_SUPPLY};
-  uint16_t max_v{0};  // 50 mV units
-  uint16_t max_i{0};  // 10 mA units
-
-  bool operator==(const PdContract &other) const {
-    return this->max_v == other.max_v && this->max_i == other.max_i && this->type == other.type;
-  }
-  bool operator!=(const PdContract &other) const { return !(*this == other); }
-};
-
-// Type-C default power: 5 V (100 x 50 mV) at 500 mA (50 x 10 mA)
-static constexpr PdContract DEFAULT_CONTRACT{PD_PDO_TYPE_FIXED_SUPPLY, 100, 50};
-
-/// A contract packed into one word so it can be shared between tasks as an atomic.
-/// 0 means there is no contract (nothing attached).
-struct PackedContract {
-  uint32_t value{0};
-
-  static PackedContract from(const PdContract &contract) {
-    return {(static_cast<uint32_t>(contract.max_v) << 16) | contract.max_i};
-  }
-  bool is_set() const { return this->value != 0; }
-  float voltage() const { return (this->value >> 16) * 0.05f; }
-  float current() const { return (this->value & 0xFFFF) * 0.01f; }
-};
-
-struct PdMsg {
-  uint8_t type{0};
-  PdSpecRevision spec_rev{PD_SPEC_REV_2};
-  uint8_t id{0};
-  uint8_t num_of_obj{0};
-  bool extended{false};
-  uint32_t data_objects[PD_MAX_NUM_DATA_OBJECTS]{};
-
-  void set_header(uint16_t header);
-  uint16_t get_coded_header() const;
-};
-
-/// USB-PD sink protocol logic, independent of the PHY chip.
-/// Everything except the getters and set_request_voltage() runs in the PHY task, which must also call
-/// check_transition_timeout_() and check_request_retry_() regularly; the protocol has no timers of its own.
-class PowerDelivery {
- public:
-  void set_request_voltage(uint8_t voltage) {
-    this->request_voltage_ = std::clamp(voltage, MIN_REQUEST_VOLTAGE, MAX_REQUEST_VOLTAGE);
-  }
-  uint8_t get_request_voltage() const { return this->request_voltage_; }
-
-  PdState get_state() const { return this->state_; }
-  bool is_connected() const { return is_connected_state(this->state_); }
-
- protected:
-  /// Returns false when the message could not be handed to the chip; the PHY logs the failure.
-  virtual bool send_message(const PdMsg &msg) = 0;
-  /// Called after state_ or contract_ changed, to let the main loop publish it.
-  virtual void on_state_changed() = 0;
-  /// Called after the source soft reset the protocol; it sends new source capabilities next.
-  virtual void on_soft_reset_received() = 0;
-  /// Called when source capabilities arrive, before the request for them is sent.
-  virtual void on_source_caps_received() = 0;
-  /// Called after an accepted request was not followed by PS_RDY in time and the state fell back to default power;
-  /// the PHY sends a soft reset so the source offers its capabilities again.
-  virtual void on_transition_timeout() = 0;
-
-  void handle_message_(const PdMsg &msg);
-  /// Called by the PHY when the chip gave up on a message after its retries without receiving a GoodCRC.
-  void handle_transmit_failed_();
-  void reset_protocol_();
-  void set_state_(PdState state);
-  void set_contract_(const PdContract &contract);
-  void clear_contract_();
-  /// Stores both before calling on_state_changed() once, so the main loop never sees the new state with the old
-  /// contract.
-  void set_state_and_contract_(PdState state, const PdContract &contract);
-  void set_ams_(bool active);
-  /// Returns true while an atomic message sequence is in progress; ends it after a timeout.
-  bool check_ams_();
-  /// Falls back to default power when the source accepted a request but did not report the new supply ready in time.
-  void check_transition_timeout_();
-  /// Sends the last request again once tSinkRequest has passed after the source answered Wait.
-  void check_request_retry_();
-
-  PdMsg make_control_msg_(PdControlMsgType type) const;
-  PdMsg make_data_msg_(PdDataMsgType type, const uint32_t *objects, uint8_t len) const;
-
-  // Shared with the main loop
-  std::atomic<PdState> state_{PdState::PD_STATE_DISCONNECTED};
-  std::atomic<uint32_t> contract_{0};
-  std::atomic<uint8_t> request_voltage_{5};
-
-  // PHY task only
-  uint32_t ams_start_{0};
-  uint32_t wait_received_ms_{0};
-  bool retry_request_pending_{false};
-
- private:
-  void handle_data_message_(const PdMsg &msg);
-  void handle_control_message_(const PdMsg &msg);
-  void handle_soft_reset_(const PdMsg &msg);
-  void respond_to_source_caps_(const PdMsg &msg);
-  bool send_request_();
-  void request_failed_();
-
-  PdContract requested_contract_{};
-  PdContract accepted_contract_{};
-  uint32_t last_rdo_{0};
-  bool active_ams_{false};
-  // Set by Accept; PS_RDY is only valid after the source accepted the request of the current sequence
-  bool ps_rdy_expected_{false};
-  uint8_t last_received_msg_id_{255};
-  uint8_t msg_counter_{0};
-  uint8_t wait_retries_{0};
-};
-
-}  // namespace esphome::fusb302b

esphome/components/gt911/touchscreen/gt911_touchscreen.cpp

@@ -24,13 +24,9 @@ static const size_t MAX_BUTTONS = 4;  // max number of buttons scanned
     return; \
   }
 
-// Reset sequence (Goodix GT911 datasheet): INT held low while RST is released selects address 0x5D, then
-// T3 + T4 pass before INT is handed back to the chip as its interrupt output
-static constexpr uint32_t RESET_LOW_MS = 10;
-static constexpr uint32_t RESET_SETTLE_MS = 5 + 50 + 1;
-
 void GT911Touchscreen::setup() {
   if (this->reset_pin_ != nullptr) {
+    // temporarily set the interrupt pin to output to control address selection
     this->reset_pin_->setup();
     this->reset_pin_->digital_write(false);
     if (this->interrupt_pin_ != nullptr) {
@@ -38,19 +34,20 @@ void GT911Touchscreen::setup() {
       this->interrupt_pin_->pin_mode(gpio::FLAG_OUTPUT);
       this->interrupt_pin_->digital_write(false);
     }
-    this->set_timeout(RESET_LOW_MS, [this] {
-      this->reset_pin_->digital_write(true);
-      this->set_timeout(RESET_SETTLE_MS, [this] { this->setup_internal_(); });
-    });
+    delay(2);
+    this->reset_pin_->digital_write(true);
+    // wait at least T3+T4 ms as per the datasheet
+    this->set_timeout(5 + 50 + 1, [this] { this->setup_internal_(); });
     return;
   }
   this->setup_internal_();
 }
 
 void GT911Touchscreen::setup_internal_() {
-  // Expander pins must leave output mode too, or the chip cannot drive its interrupt line
-  if (this->interrupt_pin_ != nullptr)
-    this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
+  if (this->interrupt_pin_ != nullptr) {
+    if (this->interrupt_pin_->is_internal())
+      this->interrupt_pin_->pin_mode(gpio::FLAG_INPUT);
+  }
 
   uint8_t data[4];
   i2c::ErrorCode err = this->write(GET_SWITCHES, sizeof(GET_SWITCHES));
@@ -75,7 +72,7 @@ void GT911Touchscreen::setup_internal_() {
           ESP_LOGD(TAG, "Interrupt pin: hardware interrupt, active %s",
                    active_high ? LOG_STR_LITERAL("HIGH") : LOG_STR_LITERAL("LOW"));
         } else {
-          // IO expander pin: no hardware interrupt, the touch state is polled.
+          // IO expander pin: leave as output for configuration only.
           ESP_LOGD(TAG, "Interrupt pin: IO expander polling mode, active %s",
                    active_high ? LOG_STR_LITERAL("HIGH") : LOG_STR_LITERAL("LOW"));
         }

esphome/components/gt911/touchscreen/gt911_touchscreen.h

@@ -14,8 +14,17 @@ class GT911ButtonListener {
 
 class GT911Touchscreen final : public touchscreen::Touchscreen, public i2c::I2CDevice {
  public:
-  /// With a reset pin the chip is reset with the interrupt pin held low, which selects address 0x5D, and the
-  /// rest of the setup runs from timeouts once the chip is ready. Without one setup_internal_() runs at once.
+  /// @brief Initialize the GT911 touchscreen.
+  ///
+  /// If @ref reset_pin_ is set, the touchscreen will be hardware reset,
+  /// and the rest of the setup will be scheduled to run 50ms later using @ref set_timeout()
+  /// to allow the device to stabilize after reset.
+  ///
+  /// If @ref interrupt_pin_ is set, it will be temporarily configured during reset
+  /// to control I2C address selection.
+  ///
+  /// After the timeout, or immediately if no reset is performed, @ref setup_internal_()
+  /// is called to complete the initialization.
   void setup() override;
   void dump_config() override;
   bool can_proceed() override { return this->setup_done_; }

esphome/components/haier/hon_climate.cpp

@@ -2,10 +2,7 @@
 #include <string>
 #include "esphome/components/climate/climate.h"
 #include "esphome/components/uart/uart.h"
-#include "esphome/core/application.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
-#include "esphome/core/progmem.h"
 #include "hon_climate.h"
 #include "hon_packet.h"
 
@@ -14,26 +11,6 @@ using namespace esphome::uart;
 
 namespace esphome::haier {
 
-static bool vertical_axis_is_auto(climate::ClimateSwingMode swing_mode) {
-  return (swing_mode == climate::CLIMATE_SWING_VERTICAL) || (swing_mode == climate::CLIMATE_SWING_BOTH);
-}
-
-static bool horizontal_axis_is_auto(climate::ClimateSwingMode swing_mode) {
-  return (swing_mode == climate::CLIMATE_SWING_HORIZONTAL) || (swing_mode == climate::CLIMATE_SWING_BOTH);
-}
-
-static bool is_auto(hon_protocol::VerticalSwingMode mode) {
-  return (mode == hon_protocol::VerticalSwingMode::AUTO) || (mode == hon_protocol::VerticalSwingMode::AUTO_SPECIAL);
-}
-
-static bool is_auto(hon_protocol::HorizontalSwingMode mode) { return mode == hon_protocol::HorizontalSwingMode::AUTO; }
-
-// A position the user just set wins over the appliance's echo of the old one for this long
-constexpr uint32_t AIRFLOW_SELECT_DEBOUNCE_MS = 10000;
-static bool in_debounce(uint32_t set_time, uint32_t now) {
-  return set_time != 0 && now - set_time < AIRFLOW_SELECT_DEBOUNCE_MS;
-}
-
 ESPHOME_LOG_TAG(TAG, "haier.climate");
 constexpr size_t SIGNAL_LEVEL_UPDATE_INTERVAL_MS = 10000;
 constexpr int PROTOCOL_OUTDOOR_TEMPERATURE_OFFSET = -64;
@@ -43,27 +20,6 @@ constexpr size_t ALARM_STATUS_REQUEST_INTERVAL_MS = 600000;
 const uint8_t ONE_BUF[] = {0x00, 0x01};
 const uint8_t ZERO_BUF[] = {0x00, 0x00};
 
-// Alarm texts indexed by alarm code; the last entry is the fallback for unknown codes
-PROGMEM_STRING_TABLE(
-    HonAlarmMessages, "Outdoor module failure", "Outdoor defrost sensor failure",
-    "Outdoor compressor exhaust sensor failure", "Outdoor EEPROM abnormality", "Indoor coil sensor failure",
-    "Indoor-outdoor communication failure", "Power supply overvoltage protection",
-    "Communication failure between panel and indoor unit", "Outdoor compressor overheat protection",
-    "Outdoor environmental sensor abnormality", "Full water protection", "Indoor EEPROM failure",
-    "Outdoor out air sensor failure", "CBD and module communication failure", "Indoor DC fan failure",
-    "Outdoor DC fan failure", "Door switch failure", "Dust filter needs cleaning reminder", "Water shortage protection",
-    "Humidity sensor failure", "Indoor temperature sensor failure", "Manipulator limit failure",
-    "Indoor PM2.5 sensor failure", "Outdoor PM2.5 sensor failure", "Indoor heating overload/high load alarm",
-    "Outdoor AC current protection", "Outdoor compressor operation abnormality", "Outdoor DC current protection",
-    "Outdoor no-load failure", "CT current abnormality", "Indoor cooling freeze protection",
-    "High and low pressure protection", "Compressor out air temperature is too high",
-    "Outdoor evaporator sensor failure", "Outdoor cooling overload", "Water pump drainage failure",
-    "Three-phase power supply failure", "Four-way valve failure", "External alarm/scraper flow switch failure",
-    "Temperature cutoff protection alarm", "Different mode operation failure", "Electronic expansion valve failure",
-    "Dual heat source sensor Tw failure", "Communication failure with the wired controller",
-    "Indoor unit address duplication failure", "50Hz zero crossing failure", "Outdoor unit failure",
-    "Formaldehyde sensor failure", "VOC sensor failure", "CO2 sensor failure", "Firewall failure", "Unknown");
-
 HonClimate::HonClimate()
     : cleaning_status_(CleaningState::NO_CLEANING), got_valid_outdoor_temp_(false), active_alarms_{0x00, 0x00, 0x00,
                                                                                                    0x00, 0x00, 0x00,
@@ -111,60 +67,21 @@ bool HonClimate::get_quiet_mode_state() const {
 }
 
 esphome::optional<hon_protocol::VerticalSwingMode> HonClimate::get_vertical_airflow() const {
-  if (!this->current_vertical_swing_.has_value()) {
-    return this->current_vertical_swing_;
-  }
-  // While the appliance swings, or right after the user chose a position, report the chosen position
-  if (is_auto(this->current_vertical_swing_.value()) ||
-      in_debounce(this->vertical_direction_set_time_, App.get_loop_component_start_time())) {
-    return this->settings_.last_vertiacal_swing;
-  }
   return this->current_vertical_swing_;
-}
+};
 
 void HonClimate::set_vertical_airflow(hon_protocol::VerticalSwingMode direction) {
-  if (is_auto(direction)) {
-    ESP_LOGW(TAG, "Vertical AUTO mode is not allowed for airflow position selector");
-    return;
-  }
-  if (this->settings_.last_vertiacal_swing != direction) {
-    this->settings_.last_vertiacal_swing = direction;
-    this->hon_rtc_.save(&this->settings_);
-  }
   this->pending_vertical_direction_ = direction;
   this->force_send_control_ = true;
-  this->vertical_direction_set_time_ = App.get_loop_component_start_time();
-#ifdef USE_SELECT
-  this->publish_airflow_selects_();
-#endif
 }
 
 esphome::optional<hon_protocol::HorizontalSwingMode> HonClimate::get_horizontal_airflow() const {
-  if (!this->current_horizontal_swing_.has_value()) {
-    return this->current_horizontal_swing_;
-  }
-  if (is_auto(this->current_horizontal_swing_.value()) ||
-      in_debounce(this->horizontal_direction_set_time_, App.get_loop_component_start_time())) {
-    return this->settings_.last_horizontal_swing;
-  }
   return this->current_horizontal_swing_;
 }
 
 void HonClimate::set_horizontal_airflow(hon_protocol::HorizontalSwingMode direction) {
-  if (is_auto(direction)) {
-    ESP_LOGW(TAG, "Horizontal AUTO mode is not allowed for airflow position selector");
-    return;
-  }
-  if (this->settings_.last_horizontal_swing != direction) {
-    this->settings_.last_horizontal_swing = direction;
-    this->hon_rtc_.save(&this->settings_);
-  }
   this->pending_horizontal_direction_ = direction;
   this->force_send_control_ = true;
-  this->horizontal_direction_set_time_ = App.get_loop_component_start_time();
-#ifdef USE_SELECT
-  this->publish_airflow_selects_();
-#endif
 }
 
 const char *HonClimate::get_cleaning_status_text() const {
@@ -594,18 +511,6 @@ void HonClimate::initialization() {
   } else {
     this->settings_ = {hon_protocol::VerticalSwingMode::CENTER, hon_protocol::HorizontalSwingMode::CENTER, true, false};
   }
-  bool settings_fixed = false;
-  if (is_auto(this->settings_.last_vertiacal_swing)) {
-    this->settings_.last_vertiacal_swing = hon_protocol::VerticalSwingMode::CENTER;
-    settings_fixed = true;
-  }
-  if (is_auto(this->settings_.last_horizontal_swing)) {
-    this->settings_.last_horizontal_swing = hon_protocol::HorizontalSwingMode::CENTER;
-    settings_fixed = true;
-  }
-  if (settings_fixed) {
-    this->hon_rtc_.save(&this->settings_);
-  }
   this->current_vertical_swing_ = this->settings_.last_vertiacal_swing;
   this->current_horizontal_swing_ = this->settings_.last_horizontal_swing;
   this->quiet_mode_state_ = this->settings_.quiet_mode_state ? SwitchState::SWITCH_ON : SwitchState::SWITCH_OFF;
@@ -741,21 +646,12 @@ haier_protocol::HaierMessage HonClimate::get_control_message() {
       }
     }
   }
-  const ClimateSwingMode target_swing_mode = this->current_hvac_settings_.swing_mode.value_or(this->swing_mode);
   if (this->pending_vertical_direction_.has_value()) {
-    if (!vertical_axis_is_auto(target_swing_mode)) {
-      out_data->vertical_swing_mode = (uint8_t) this->pending_vertical_direction_.value();
-    } else {
-      ESP_LOGD(TAG, "Vertical swing is on; the position is kept for when it is turned off");
-    }
+    out_data->vertical_swing_mode = (uint8_t) this->pending_vertical_direction_.value();
     this->pending_vertical_direction_.reset();
   }
   if (this->pending_horizontal_direction_.has_value()) {
-    if (!horizontal_axis_is_auto(target_swing_mode)) {
-      out_data->horizontal_swing_mode = (uint8_t) this->pending_horizontal_direction_.value();
-    } else {
-      ESP_LOGD(TAG, "Horizontal swing is on; the position is kept for when it is turned off");
-    }
+    out_data->horizontal_swing_mode = (uint8_t) this->pending_horizontal_direction_.value();
     this->pending_horizontal_direction_.reset();
   }
   {
@@ -791,17 +687,9 @@ void HonClimate::process_alarm_message_(const uint8_t *packet, uint8_t size, boo
             if ((packet[2 + i] & alarm_bit) != (this->active_alarms_[i] & alarm_bit)) {
               bool alarm_status = (packet[2 + i] & alarm_bit) != 0;
               int log_level = alarm_status ? ESPHOME_LOG_LEVEL_WARN : ESPHOME_LOG_LEVEL_INFO;
-#ifdef USE_ESP8266
-              // Static so a delayed on_alarm automation can still read it, but only until the next
-              // alarm change, including a later one in this packet; `code` stays correct
-              static char alarm_message[HonAlarmMessages::MAX_LENGTH + 1];
-              ESPHOME_strncpy_P(alarm_message,
-                                reinterpret_cast<const char *>(
-                                    HonAlarmMessages::get_progmem_str(alarm_code, HonAlarmMessages::LAST_INDEX)),
-                                sizeof(alarm_message));
-#else
-              const char *alarm_message = HonAlarmMessages::get_progmem_str(alarm_code, HonAlarmMessages::LAST_INDEX);
-#endif
+              const char *alarm_message = alarm_code < esphome::haier::hon_protocol::HON_ALARM_COUNT
+                                              ? esphome::haier::hon_protocol::HON_ALARM_MESSAGES[alarm_code].c_str()
+                                              : "Unknown";
               esp_log_printf_(log_level, TAG, __LINE__, "Alarm %s (%d): %s", alarm_status ? "activated" : "deactivated",
                               alarm_code, alarm_message);
               if (alarm_status) {
@@ -922,41 +810,6 @@ void HonClimate::set_quiet_mode_switch(switch_::Switch *sw) {
 }
 #endif  // USE_SWITCH
 
-#ifdef USE_SELECT
-template<typename Mode, size_t N>
-static void publish_airflow_index(select::Select *sel, const std::array<Mode, N> &order, Mode mode) {
-  if (sel == nullptr) {
-    return;
-  }
-  // Saved settings never hold AUTO after initialization(); any other value outside the table shows as Center
-  size_t index = N;
-  size_t center = 0;
-  for (size_t i = 0; i < N; i++) {
-    const Mode entry = airflow_order_at(order, i);
-    if (entry == mode) {
-      index = i;
-    } else if (entry == Mode::CENTER) {
-      center = i;
-    }
-  }
-  if (index == N) {
-    index = center;
-  }
-  const auto active = sel->active_index();
-  if (active.has_value() && *active == index) {
-    return;
-  }
-  sel->publish_state(index);
-}
-
-void HonClimate::publish_airflow_selects_() {
-  publish_airflow_index(this->vertical_airflow_select_, VERTICAL_SWING_MODES_ORDER,
-                        this->settings_.last_vertiacal_swing);
-  publish_airflow_index(this->horizontal_airflow_select_, HORIZONTAL_SWING_MODES_ORDER,
-                        this->settings_.last_horizontal_swing);
-}
-#endif  // USE_SELECT
-
 haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *packet_buffer, uint8_t size) {
   size_t expected_size =
       2 + this->status_message_header_size_ + this->real_control_packet_size_ + this->real_sensors_packet_size_;
@@ -1191,25 +1044,16 @@ haier_protocol::HandlerError HonClimate::process_status_message_(const uint8_t *
     // Saving last known non auto mode for vertical and horizontal swing
     this->current_vertical_swing_ = (hon_protocol::VerticalSwingMode) packet.control.vertical_swing_mode;
     this->current_horizontal_swing_ = (hon_protocol::HorizontalSwingMode) packet.control.horizontal_swing_mode;
-    const uint32_t now_ms = App.get_loop_component_start_time();
-    bool save_vertical = !in_debounce(this->vertical_direction_set_time_, now_ms) &&
-                         !is_auto(this->current_vertical_swing_.value()) &&
-                         (this->current_vertical_swing_.value() != this->settings_.last_vertiacal_swing);
-    bool save_horizontal = !in_debounce(this->horizontal_direction_set_time_, now_ms) &&
-                           !is_auto(this->current_horizontal_swing_.value()) &&
-                           (this->current_horizontal_swing_.value() != this->settings_.last_horizontal_swing);
-    if (save_vertical || save_horizontal) {
-      if (save_vertical) {
-        this->settings_.last_vertiacal_swing = this->current_vertical_swing_.value();
-      }
-      if (save_horizontal) {
-        this->settings_.last_horizontal_swing = this->current_horizontal_swing_.value();
-      }
+    bool save_settings = ((this->current_vertical_swing_.value() != hon_protocol::VerticalSwingMode::AUTO) &&
+                          (this->current_vertical_swing_.value() != hon_protocol::VerticalSwingMode::AUTO_SPECIAL) &&
+                          (this->current_vertical_swing_.value() != this->settings_.last_vertiacal_swing)) ||
+                         ((this->current_horizontal_swing_.value() != hon_protocol::HorizontalSwingMode::AUTO) &&
+                          (this->current_horizontal_swing_.value() != this->settings_.last_horizontal_swing));
+    if (save_settings) {
+      this->settings_.last_vertiacal_swing = this->current_vertical_swing_.value();
+      this->settings_.last_horizontal_swing = this->current_horizontal_swing_.value();
       this->hon_rtc_.save(&this->settings_);
     }
-#ifdef USE_SELECT
-    this->publish_airflow_selects_();
-#endif
     should_publish = should_publish || (old_swing_mode != this->swing_mode);
   }
   this->last_valid_status_timestamp_ = std::chrono::steady_clock::now();
@@ -1385,10 +1229,8 @@ void HonClimate::fill_control_messages_queue_() {
                                               (uint8_t) hon_protocol::DataParameters::SET_POINT,
                                           buffer, 2);
   }
-  ClimateSwingMode target_swing_mode = this->swing_mode;
   // Vertical swing mode
   if (climate_control.swing_mode.has_value()) {
-    target_swing_mode = climate_control.swing_mode.value();
     uint8_t vertical_swing_buf[] = {0x00, (uint8_t) hon_protocol::VerticalSwingMode::AUTO};
     uint8_t horizontal_swing_buf[] = {0x00, (uint8_t) hon_protocol::HorizontalSwingMode::AUTO};
     switch (climate_control.swing_mode.value()) {
@@ -1414,32 +1256,6 @@ void HonClimate::fill_control_messages_queue_() {
                                               (uint8_t) hon_protocol::DataParameters::VERTICAL_SWING_MODE,
                                           vertical_swing_buf, 2);
   }
-  // A swing change above already sent both axes from settings_.last_*, which set_*_airflow() updated
-  const bool swing_sent = climate_control.swing_mode.has_value();
-  if (this->pending_vertical_direction_.has_value()) {
-    if (vertical_axis_is_auto(target_swing_mode)) {
-      ESP_LOGD(TAG, "Vertical swing is on; the position is kept for when it is turned off");
-    } else if (!swing_sent) {
-      uint8_t vertical_swing_buf[] = {0x00, (uint8_t) this->pending_vertical_direction_.value()};
-      this->control_messages_queue_.emplace(haier_protocol::FrameType::CONTROL,
-                                            (uint16_t) hon_protocol::SubcommandsControl::SET_SINGLE_PARAMETER +
-                                                (uint8_t) hon_protocol::DataParameters::VERTICAL_SWING_MODE,
-                                            vertical_swing_buf, 2);
-    }
-    this->pending_vertical_direction_.reset();
-  }
-  if (this->pending_horizontal_direction_.has_value()) {
-    if (horizontal_axis_is_auto(target_swing_mode)) {
-      ESP_LOGD(TAG, "Horizontal swing is on; the position is kept for when it is turned off");
-    } else if (!swing_sent) {
-      uint8_t horizontal_swing_buf[] = {0x00, (uint8_t) this->pending_horizontal_direction_.value()};
-      this->control_messages_queue_.emplace(haier_protocol::FrameType::CONTROL,
-                                            (uint16_t) hon_protocol::SubcommandsControl::SET_SINGLE_PARAMETER +
-                                                (uint8_t) hon_protocol::DataParameters::HORIZONTAL_SWING_MODE,
-                                            horizontal_swing_buf, 2);
-    }
-    this->pending_horizontal_direction_.reset();
-  }
   // Fan mode
   if (climate_control.fan_mode.has_value()) {
     switch (climate_control.fan_mode.value()) {