Move replaceme check therefore allowing actual line to be shown

.ai/instructions.md

@@ -1,222 +0,0 @@
-# ESPHome AI Collaboration Guide
-
-This document provides essential context for AI models interacting with this project. Adhering to these guidelines will ensure consistency and maintain code quality.
-
-## 1. Project Overview & Purpose
-
-*   **Primary Goal:** ESPHome is a system to configure microcontrollers (like ESP32, ESP8266, RP2040, and LibreTiny-based chips) using simple yet powerful YAML configuration files. It generates C++ firmware that can be compiled and flashed to these devices, allowing users to control them remotely through home automation systems.
-*   **Business Domain:** Internet of Things (IoT), Home Automation.
-
-## 2. Core Technologies & Stack
-
-*   **Languages:** Python (>=3.10), C++ (gnu++20)
-*   **Frameworks & Runtimes:** PlatformIO, Arduino, ESP-IDF.
-*   **Build Systems:** PlatformIO is the primary build system. CMake is used as an alternative.
-*   **Configuration:** YAML.
-*   **Key Libraries/Dependencies:**
-    *   **Python:** `voluptuous` (for configuration validation), `PyYAML` (for parsing configuration files), `paho-mqtt` (for MQTT communication), `tornado` (for the web server), `aioesphomeapi` (for the native API).
-    *   **C++:** `ArduinoJson` (for JSON serialization/deserialization), `AsyncMqttClient-esphome` (for MQTT), `ESPAsyncWebServer` (for the web server).
-*   **Package Manager(s):** `pip` (for Python dependencies), `platformio` (for C++/PlatformIO dependencies).
-*   **Communication Protocols:** Protobuf (for native API), MQTT, HTTP.
-
-## 3. Architectural Patterns
-
-*   **Overall Architecture:** The project follows a code-generation architecture. The Python code parses user-defined YAML configuration files and generates C++ source code. This C++ code is then compiled and flashed to the target microcontroller using PlatformIO.
-
-*   **Directory Structure Philosophy:**
-    *   `/esphome`: Contains the core Python source code for the ESPHome application.
-    *   `/esphome/components`: Contains the individual components that can be used in ESPHome configurations. Each component is a self-contained unit with its own C++ and Python code.
-    *   `/tests`: Contains all unit and integration tests for the Python code.
-    *   `/docker`: Contains Docker-related files for building and running ESPHome in a container.
-    *   `/script`: Contains helper scripts for development and maintenance.
-
-*   **Core Architectural Components:**
-    1.  **Configuration System** (`esphome/config*.py`): Handles YAML parsing and validation using Voluptuous, schema definitions, and multi-platform configurations.
-    2.  **Code Generation** (`esphome/codegen.py`, `esphome/cpp_generator.py`): Manages Python to C++ code generation, template processing, and build flag management.
-    3.  **Component System** (`esphome/components/`): Contains modular hardware and software components with platform-specific implementations and dependency management.
-    4.  **Core Framework** (`esphome/core/`): Manages the application lifecycle, hardware abstraction, and component registration.
-    5.  **Dashboard** (`esphome/dashboard/`): A web-based interface for device configuration, management, and OTA updates.
-
-*   **Platform Support:**
-    1.  **ESP32** (`components/esp32/`): Espressif ESP32 family. Supports multiple variants (S2, S3, C3, etc.) and both IDF and Arduino frameworks.
-    2.  **ESP8266** (`components/esp8266/`): Espressif ESP8266. Arduino framework only, with memory constraints.
-    3.  **RP2040** (`components/rp2040/`): Raspberry Pi Pico/RP2040. Arduino framework with PIO (Programmable I/O) support.
-    4.  **LibreTiny** (`components/libretiny/`): Realtek and Beken chips. Supports multiple chip families and auto-generated components.
-
-## 4. Coding Conventions & Style Guide
-
-*   **Formatting:**
-    *   **Python:** Uses `ruff` and `flake8` for linting and formatting. Configuration is in `pyproject.toml`.
-    *   **C++:** Uses `clang-format` for formatting. Configuration is in `.clang-format`.
-
-*   **Naming Conventions:**
-    *   **Python:** Follows PEP 8. Use clear, descriptive names following snake_case.
-    *   **C++:** Follows the Google C++ Style Guide.
-
-*   **Component Structure:**
-    *   **Standard Files:**
-        ```
-        components/[component_name]/
-        ├── __init__.py          # Component configuration schema and code generation
-        ├── [component].h        # C++ header file (if needed)
-        ├── [component].cpp      # C++ implementation (if needed)
-        └── [platform]/         # Platform-specific implementations
-            ├── __init__.py      # Platform-specific configuration
-            ├── [platform].h     # Platform C++ header
-            └── [platform].cpp   # Platform C++ implementation
-        ```
-
-    *   **Component Metadata:**
-        - `DEPENDENCIES`: List of required components
-        - `AUTO_LOAD`: Components to automatically load
-        - `CONFLICTS_WITH`: Incompatible components
-        - `CODEOWNERS`: GitHub usernames responsible for maintenance
-        - `MULTI_CONF`: Whether multiple instances are allowed
-
-*   **Code Generation & Common Patterns:**
-    *   **Configuration Schema Pattern:**
-        ```python
-        import esphome.codegen as cg
-        import esphome.config_validation as cv
-        from esphome.const import CONF_KEY, CONF_ID
-
-        CONF_PARAM = "param"  # A constant that does not yet exist in esphome/const.py
-
-        my_component_ns = cg.esphome_ns.namespace("my_component")
-        MyComponent = my_component_ns.class_("MyComponent", cg.Component)
-
-        CONFIG_SCHEMA = cv.Schema({
-            cv.GenerateID(): cv.declare_id(MyComponent),
-            cv.Required(CONF_KEY): cv.string,
-            cv.Optional(CONF_PARAM, default=42): cv.int_,
-        }).extend(cv.COMPONENT_SCHEMA)
-
-        async def to_code(config):
-            var = cg.new_Pvariable(config[CONF_ID])
-            await cg.register_component(var, config)
-            cg.add(var.set_key(config[CONF_KEY]))
-            cg.add(var.set_param(config[CONF_PARAM]))
-        ```
-
-    *   **C++ Class Pattern:**
-        ```cpp
-        namespace esphome {
-        namespace my_component {
-
-        class MyComponent : public Component {
-         public:
-          void setup() override;
-          void loop() override;
-          void dump_config() override;
-
-          void set_key(const std::string &key) { this->key_ = key; }
-          void set_param(int param) { this->param_ = param; }
-
-         protected:
-          std::string key_;
-          int param_{0};
-        };
-
-        }  // namespace my_component
-        }  // namespace esphome
-        ```
-
-    *   **Common Component Examples:**
-        - **Sensor:**
-          ```python
-          from esphome.components import sensor
-          CONFIG_SCHEMA = sensor.sensor_schema(MySensor).extend(cv.polling_component_schema("60s"))
-          async def to_code(config):
-              var = await sensor.new_sensor(config)
-              await cg.register_component(var, config)
-          ```
-
-        - **Binary Sensor:**
-          ```python
-          from esphome.components import binary_sensor
-          CONFIG_SCHEMA = binary_sensor.binary_sensor_schema().extend({ ... })
-          async def to_code(config):
-              var = await binary_sensor.new_binary_sensor(config)
-          ```
-
-        - **Switch:**
-          ```python
-          from esphome.components import switch
-          CONFIG_SCHEMA = switch.switch_schema().extend({ ... })
-          async def to_code(config):
-              var = await switch.new_switch(config)
-          ```
-
-*   **Configuration Validation:**
-    *   **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)`.
-    *   **Platform-Specific:** `cv.only_on(["esp32", "esp8266"])`, `cv.only_with_arduino`.
-    *   **Schema Extensions:**
-        ```python
-        CONFIG_SCHEMA = cv.Schema({ ... })
-         .extend(cv.COMPONENT_SCHEMA)
-         .extend(uart.UART_DEVICE_SCHEMA)
-         .extend(i2c.i2c_device_schema(0x48))
-         .extend(spi.spi_device_schema(cs_pin_required=True))
-        ```
-
-## 5. Key Files & Entrypoints
-
-*   **Main Entrypoint(s):** `esphome/__main__.py` is the main entrypoint for the ESPHome command-line interface.
-*   **Configuration:**
-    *   `pyproject.toml`: Defines the Python project metadata and dependencies.
-    *   `platformio.ini`: Configures the PlatformIO build environments for different microcontrollers.
-    *   `.pre-commit-config.yaml`: Configures the pre-commit hooks for linting and formatting.
-*   **CI/CD Pipeline:** Defined in `.github/workflows`.
-
-## 6. Development & Testing Workflow
-
-*   **Local Development Environment:** Use the provided Docker container or create a Python virtual environment and install dependencies from `requirements_dev.txt`.
-*   **Running Commands:** Use the `script/run-in-env.py` script to execute commands within the project's virtual environment. For example, to run the linter: `python3 script/run-in-env.py pre-commit run`.
-*   **Testing:**
-    *   **Python:** Run unit tests with `pytest`.
-    *   **C++:** Use `clang-tidy` for static analysis.
-    *   **Component Tests:** YAML-based compilation tests are located in `tests/`. The structure is as follows:
-        ```
-        tests/
-        ├── test_build_components/ # Base test configurations
-        └── components/[component]/ # Component-specific tests
-        ```
-        Run them using `script/test_build_components`. Use `-c <component>` to test specific components and `-t <target>` for specific platforms.
-*   **Debugging and Troubleshooting:**
-    *   **Debug Tools:**
-        - `esphome config <file>.yaml` to validate configuration.
-        - `esphome compile <file>.yaml` to compile without uploading.
-        - Check the Dashboard for real-time logs.
-        - Use component-specific debug logging.
-    *   **Common Issues:**
-        - **Import Errors**: Check component dependencies and `PYTHONPATH`.
-        - **Validation Errors**: Review configuration schema definitions.
-        - **Build Errors**: Check platform compatibility and library versions.
-        - **Runtime Errors**: Review generated C++ code and component logic.
-
-## 7. Specific Instructions for AI Collaboration
-
-*   **Contribution Workflow (Pull Request Process):**
-    1.  **Fork & Branch:** Create a new branch in your fork.
-    2.  **Make Changes:** Adhere to all coding conventions and patterns.
-    3.  **Test:** Create component tests for all supported platforms and run the full test suite locally.
-    4.  **Lint:** Run `pre-commit` to ensure code is compliant.
-    5.  **Commit:** Commit your changes. There is no strict format for commit messages.
-    6.  **Pull Request:** Submit a PR against the `dev` branch. The Pull Request title should have a prefix of the component being worked on (e.g., `[display] Fix bug`, `[abc123] Add new component`). Update documentation, examples, and add `CODEOWNERS` entries as needed. Pull requests should always be made with the PULL_REQUEST_TEMPLATE.md template filled out correctly.
-
-*   **Documentation Contributions:**
-    *   Documentation is hosted in the separate `esphome/esphome-docs` repository.
-    *   The contribution workflow is the same as for the codebase.
-
-*   **Best Practices:**
-    *   **Component Development:** Keep dependencies minimal, provide clear error messages, and write comprehensive docstrings and tests.
-    *   **Code Generation:** Generate minimal and efficient C++ code. Validate all user inputs thoroughly. Support multiple platform variations.
-    *   **Configuration Design:** Aim for simplicity with sensible defaults, while allowing for advanced customization.
-
-*   **Security:** Be mindful of security when making changes to the API, web server, or any other network-related code. Do not hardcode secrets or keys.
-
-*   **Dependencies & Build System Integration:**
-    *   **Python:** When adding a new Python dependency, add it to the appropriate `requirements*.txt` file and `pyproject.toml`.
-    *   **C++ / PlatformIO:** When adding a new C++ dependency, add it to `platformio.ini` and use `cg.add_library`.
-    *   **Build Flags:** Use `cg.add_build_flag(...)` to add compiler flags.

.clang-tidy

@@ -5,42 +5,26 @@ Checks: >-
   -altera-*,
   -android-*,
   -boost-*,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-multi-level-implicit-pointer-conversion,
   -bugprone-narrowing-conversions,
   -bugprone-signed-char-misuse,
-  -bugprone-switch-missing-default-case,
   -cert-dcl50-cpp,
-  -cert-err33-c,
   -cert-err58-cpp,
   -cert-oop57-cpp,
   -cert-str34-c,
-  -clang-analyzer-optin.core.EnumCastOutOfRange,
   -clang-analyzer-optin.cplusplus.UninitializedObject,
   -clang-analyzer-osx.*,
   -clang-diagnostic-delete-abstract-non-virtual-dtor,
   -clang-diagnostic-delete-non-abstract-non-virtual-dtor,
-  -clang-diagnostic-deprecated-declarations,
-  -clang-diagnostic-ignored-optimization-argument,
-  -clang-diagnostic-missing-field-initializers,
   -clang-diagnostic-shadow-field,
   -clang-diagnostic-unused-const-variable,
   -clang-diagnostic-unused-parameter,
-  -clang-diagnostic-vla-cxx-extension,
   -concurrency-*,
   -cppcoreguidelines-avoid-c-arrays,
-  -cppcoreguidelines-avoid-const-or-ref-data-members,
-  -cppcoreguidelines-avoid-do-while,
   -cppcoreguidelines-avoid-magic-numbers,
   -cppcoreguidelines-init-variables,
-  -cppcoreguidelines-macro-to-enum,
   -cppcoreguidelines-macro-usage,
-  -cppcoreguidelines-missing-std-forward,
   -cppcoreguidelines-narrowing-conversions,
   -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-owning-memory,
-  -cppcoreguidelines-prefer-member-initializer,
   -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
   -cppcoreguidelines-pro-bounds-constant-array-index,
   -cppcoreguidelines-pro-bounds-pointer-arithmetic,
@@ -51,10 +35,7 @@ Checks: >-
   -cppcoreguidelines-pro-type-static-cast-downcast,
   -cppcoreguidelines-pro-type-union-access,
   -cppcoreguidelines-pro-type-vararg,
-  -cppcoreguidelines-rvalue-reference-param-not-moved,
   -cppcoreguidelines-special-member-functions,
-  -cppcoreguidelines-use-default-member-init,
-  -cppcoreguidelines-virtual-class-destructor,
   -fuchsia-multiple-inheritance,
   -fuchsia-overloaded-operator,
   -fuchsia-statically-constructed-objects,
@@ -73,33 +54,20 @@ Checks: >-
   -llvm-include-order,
   -llvm-qualified-auto,
   -llvmlibc-*,
-  -misc-const-correctness,
-  -misc-include-cleaner,
-  -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
+  -misc-no-recursion,
   -misc-unused-parameters,
-  -misc-use-anonymous-namespace,
-  -modernize-avoid-bind,
   -modernize-avoid-c-arrays,
+  -modernize-avoid-bind,
   -modernize-concat-nested-namespaces,
-  -modernize-macro-to-enum,
   -modernize-return-braced-init-list,
-  -modernize-type-traits,
   -modernize-use-auto,
-  -modernize-use-constraints,
   -modernize-use-default-member-init,
   -modernize-use-equals-default,
-  -modernize-use-nodiscard,
-  -modernize-use-nullptr,
-  -modernize-use-nodiscard,
-  -modernize-use-nullptr,
   -modernize-use-trailing-return-type,
+  -modernize-use-nodiscard,
   -mpi-*,
   -objc-*,
-  -performance-enum-size,
-  -readability-avoid-nested-conditional-operator,
-  -readability-container-contains,
-  -readability-container-data-pointer,
   -readability-convert-member-functions-to-static,
   -readability-else-after-return,
   -readability-function-cognitive-complexity,
@@ -107,16 +75,15 @@ Checks: >-
   -readability-isolate-declaration,
   -readability-magic-numbers,
   -readability-make-member-function-const,
-  -readability-named-parameter,
-  -readability-redundant-casting,
-  -readability-redundant-inline-specifier,
-  -readability-redundant-member-init,
   -readability-redundant-string-init,
   -readability-uppercase-literal-suffix,
   -readability-use-anyofallof,
 WarningsAsErrors: '*'
+AnalyzeTemporaryDtors: false
 FormatStyle:     google
 CheckOptions:
+  - key:             google-readability-braces-around-statements.ShortStatementLines
+    value:           '1'
   - key:             google-readability-function-size.StatementThreshold
     value:           '800'
   - key:             google-runtime-int.TypeSuffix
@@ -191,9 +158,3 @@ CheckOptions:
     value:           ''
   - key:             readability-qualified-auto.AddConstToQualified
     value:           0
-  - key:             readability-identifier-length.MinimumVariableNameLength
-    value:           0
-  - key:             readability-identifier-length.MinimumParameterNameLength
-    value:           0
-  - key:             readability-identifier-length.MinimumLoopCounterNameLength
-    value:           0

.clang-tidy.hash

@@ -1 +0,0 @@
-0c2acbc16bfb7d63571dbe7042f94f683be25e4ca8a0f158a960a94adac4b931

.coveragerc

@@ -1,4 +1,2 @@
 [run]
-omit =
-    esphome/components/*
-    tests/integration/*
+omit = esphome/components/*

.devcontainer/Dockerfile

@@ -1,37 +0,0 @@
-ARG BUILD_BASE_VERSION=2025.04.0
-
-
-FROM ghcr.io/esphome/docker-base:debian-${BUILD_BASE_VERSION} AS base
-
-RUN git config --system --add safe.directory "*"
-
-RUN apt update \
-    && apt install -y \
-      protobuf-compiler
-
-RUN pip install uv
-
-RUN useradd esphome -m
-
-USER esphome
-ENV VIRTUAL_ENV=/home/esphome/.local/esphome-venv
-RUN uv venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-# Override this set to true in the docker-base image
-ENV UV_SYSTEM_PYTHON=false
-
-WORKDIR /tmp
-
-COPY requirements.txt ./
-RUN uv pip install -r requirements.txt
-COPY requirements_dev.txt requirements_test.txt ./
-RUN uv pip install -r requirements_dev.txt -r requirements_test.txt
-
-RUN \
-    platformio settings set enable_telemetry No \
-    && platformio settings set check_platformio_interval 1000000
-
-COPY script/platformio_install_deps.py platformio.ini ./
-RUN ./platformio_install_deps.py platformio.ini --libraries --platforms --tools
-
-WORKDIR /workspaces

.devcontainer/devcontainer.json

@@ -1,87 +1,56 @@
 {
   "name": "ESPHome Dev",
-  "context": "..",
-  "dockerFile": "Dockerfile",
+  "image": "ghcr.io/esphome/esphome-lint:dev",
   "postCreateCommand": [
     "script/devcontainer-post-create"
   ],
-  "features": {
-    "ghcr.io/devcontainers/features/github-cli:1": {}
-  },
   "runArgs": [
     "--privileged",
     "-e",
-    "GIT_EDITOR=code --wait"
-    // uncomment and edit the path in order to pass though local USB serial to the conatiner
-    // , "--device=/dev/ttyACM0"
+    "ESPHOME_DASHBOARD_USE_PING=1"
   ],
   "appPort": 6052,
-  // if you are using avahi in the host device, uncomment these to allow the
-  // devcontainer to find devices via mdns
-  //"mounts": [
-  //  "type=bind,source=/dev/bus/usb,target=/dev/bus/usb",
-  //  "type=bind,source=/var/run/dbus,target=/var/run/dbus",
-  //  "type=bind,source=/var/run/avahi-daemon/socket,target=/var/run/avahi-daemon/socket"
-  //],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        // python
-        "ms-python.python",
-        "ms-python.pylint",
-        "ms-python.flake8",
-        "charliermarsh.ruff",
-        "visualstudioexptteam.vscodeintellicode",
-        // yaml
-        "redhat.vscode-yaml",
-        // cpp
-        "ms-vscode.cpptools",
-        // editorconfig
-        "editorconfig.editorconfig"
-      ],
-      "settings": {
-        "python.languageServer": "Pylance",
-        "python.pythonPath": "/usr/bin/python3",
-        "pylint.args": [
-          "--rcfile=${workspaceFolder}/pyproject.toml"
-        ],
-        "flake8.args": [
-          "--config=${workspaceFolder}/.flake8"
-        ],
-        "ruff.configuration": "${workspaceFolder}/pyproject.toml",
-        "[python]": {
-          // VS will say "Value is not accepted" before building the devcontainer, but the warning
-          // should go away after build is completed.
-          "editor.defaultFormatter": "charliermarsh.ruff"
-        },
-        "editor.formatOnPaste": false,
-        "editor.formatOnSave": true,
-        "editor.formatOnType": true,
-        "files.trimTrailingWhitespace": true,
-        "terminal.integrated.defaultProfile.linux": "bash",
-        "yaml.customTags": [
-          "!secret scalar",
-          "!lambda scalar",
-          "!extend scalar",
-          "!remove scalar",
-          "!include_dir_named scalar",
-          "!include_dir_list scalar",
-          "!include_dir_merge_list scalar",
-          "!include_dir_merge_named scalar"
-        ],
-        "files.exclude": {
-          "**/.git": true,
-          "**/.DS_Store": true,
-          "**/*.pyc": {
-            "when": "$(basename).py"
-          },
-          "**/__pycache__": true
-        },
-        "files.associations": {
-          "**/.vscode/*.json": "jsonc"
-        },
-        "C_Cpp.clang_format_path": "/usr/bin/clang-format-13"
-      }
-    }
+  "extensions": [
+    // python
+    "ms-python.python",
+    "visualstudioexptteam.vscodeintellicode",
+    // yaml
+    "redhat.vscode-yaml",
+    // cpp
+    "ms-vscode.cpptools",
+    // editorconfig
+    "editorconfig.editorconfig",
+  ],
+  "settings": {
+    "python.languageServer": "Pylance",
+    "python.pythonPath": "/usr/bin/python3",
+    "python.linting.pylintEnabled": true,
+    "python.linting.enabled": true,
+    "python.formatting.provider": "black",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true,
+    "terminal.integrated.defaultProfile.linux": "bash",
+    "yaml.customTags": [
+      "!secret scalar",
+      "!lambda scalar",
+      "!include_dir_named scalar",
+      "!include_dir_list scalar",
+      "!include_dir_merge_list scalar",
+      "!include_dir_merge_named scalar"
+    ],
+    "files.exclude": {
+      "**/.git": true,
+      "**/.DS_Store": true,
+      "**/*.pyc": {
+        "when": "$(basename).py"
+      },
+      "**/__pycache__": true
+    },
+    "files.associations": {
+      "**/.vscode/*.json": "jsonc"
+    },
+    "C_Cpp.clang_format_path": "/usr/bin/clang-format-11",
   }
 }

.dockerignore

@@ -75,9 +75,6 @@ target/
 # pyenv
 .python-version
 
-# asdf
-.tool-versions
-
 # celery beat schedule file
 celerybeat-schedule
 
@@ -114,5 +111,4 @@ config/
 examples/
 Dockerfile
 .git/
-tests/
-.*
+tests/build/

.gitattributes

@@ -1,3 +1,2 @@
 # Normalize line endings to LF in the repository
 * text eol=lf
-*.png binary

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+---
+# These are supported funding model platforms
+
+custom: https://www.nabucasa.com

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,96 +0,0 @@
-name: Report an issue with ESPHome
-description: Report an issue with ESPHome.
-body:
-  - type: markdown
-    attributes:
-      value: |
-        This issue form is for reporting bugs only!
-
-        If you have a feature request or enhancement, please [request them here instead][fr].
-
-        [fr]: https://github.com/orgs/esphome/discussions
-  - type: textarea
-    validations:
-      required: true
-    id: problem
-    attributes:
-      label: The problem
-      description: >-
-        Describe the issue you are experiencing here to communicate to the
-        maintainers. Tell us what you were trying to do and what happened.
-
-        Provide a clear and concise description of what the problem is.
-
-        ⚠️ **WARNING: Do NOT paste logs, stack traces, or error messages here!**
-        Use the "Logs" section below instead. Issues with logs
-        in this field will be automatically closed.
-
-  - type: markdown
-    attributes:
-      value: |
-        ## Environment
-  - type: input
-    id: version
-    validations:
-      required: true
-    attributes:
-      label: Which version of ESPHome has the issue?
-      description: >
-        ESPHome version like 1.19, 2025.6.0 or 2025.XX.X-dev.
-  - type: dropdown
-    validations:
-      required: true
-    id: installation
-    attributes:
-      label: What type of installation are you using?
-      options:
-        - Home Assistant Add-on
-        - Docker
-        - pip
-  - type: dropdown
-    validations:
-      required: true
-    id: platform
-    attributes:
-      label: What platform are you using?
-      options:
-        - ESP8266
-        - ESP32
-        - RP2040
-        - BK72XX
-        - RTL87XX
-        - LN882X
-        - Host
-        - Other
-  - type: input
-    id: component_name
-    attributes:
-      label: Component causing the issue
-      description: >
-        The name of the component or platform. For example, api/i2c or ultrasonic.
-
-  - type: markdown
-    attributes:
-      value: |
-        # Details
-  - type: textarea
-    id: config
-    attributes:
-      label: YAML Config
-      description: |
-        Include a complete YAML configuration file demonstrating the problem here. Preferably post the *entire* file - don't make assumptions about what is unimportant. However, if it's a large or complicated config then you will need to reduce it to the smallest possible file *that still demonstrates the problem*. If you don't provide enough information to *easily* reproduce the problem, it's unlikely your bug report will get any attention. Logs do not belong here, attach them below.
-      render: yaml
-  - type: textarea
-    id: logs
-    attributes:
-      label: Logs
-      description: For example, error message, or stack traces. Serial or USB logs are much more useful than WiFi logs.
-      render: txt
-  - type: textarea
-    id: additional
-    attributes:
-      label: Additional information
-      description: >
-        If you have any additional information for us, use the field below.
-        Please note, you can attach screenshots or screen recordings here, by
-        dragging and dropping files in the field below.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,21 +1,15 @@
 ---
 blank_issues_enabled: false
 contact_links:
-  - name: Report an issue with the ESPHome documentation
-    url: https://github.com/esphome/esphome-docs/issues/new/choose
-    about: Report an issue with the ESPHome documentation.
-  - name: Report an issue with the ESPHome web server
-    url: https://github.com/esphome/esphome-webserver/issues/new/choose
-    about: Report an issue with the ESPHome web server.
-  - name: Report an issue with the ESPHome Builder / Dashboard
-    url: https://github.com/esphome/dashboard/issues/new/choose
-    about: Report an issue with the ESPHome Builder / Dashboard.
-  - name: Report an issue with the ESPHome API client
-    url: https://github.com/esphome/aioesphomeapi/issues/new/choose
-    about: Report an issue with the ESPHome API client.
-  - name: Make a Feature Request
-    url: https://github.com/orgs/esphome/discussions
-    about: Please create feature requests in the dedicated feature request tracker.
+  - name: Issue Tracker
+    url: https://github.com/esphome/issues
+    about: Please create bug reports in the dedicated issue tracker.
+  - name: Feature Request Tracker
+    url: https://github.com/esphome/feature-requests
+    about: |
+      Please create feature requests in the dedicated feature request tracker.
   - name: Frequently Asked Question
     url: https://esphome.io/guides/faq.html
-    about: Please view the FAQ for common questions and what to include in a bug report.
+    about: |
+      Please view the FAQ for common questions and what
+      to include in a bug report.

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,16 +7,11 @@
 - [ ] Bugfix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
-- [ ] Code quality improvements to existing code or addition of tests
 - [ ] Other
 
-**Related issue or feature (if applicable):**
+**Related issue or feature (if applicable):** fixes <link to issue>
 
-- fixes <link to issue>
-
-**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):**
-
-- esphome/esphome-docs#<esphome-docs PR number goes here>
+**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here>
 
 ## Test Environment
 
@@ -24,11 +19,14 @@
 - [ ] ESP32 IDF
 - [ ] ESP8266
 - [ ] RP2040
-- [ ] BK72xx
-- [ ] RTL87xx
-- [ ] nRF52840
 
 ## Example entry for `config.yaml`:
+<!--
+  Supplying a configuration snippet, makes it easier for a maintainer to test
+  your PR. Furthermore, for new integrations, it gives an impression of how
+  the configuration would look like.
+  Note: Remove this section if this PR does not have an example entry.
+-->
 
 ```yaml
 # Example config.yaml

.github/actions/build-image/action.yaml

@@ -1,98 +0,0 @@
-name: Build Image
-inputs:
-  target:
-    description: "Target to build"
-    required: true
-    example: "docker"
-  build_type:
-    description: "Build type"
-    required: true
-    example: "docker"
-  suffix:
-    description: "Suffix to add to tags"
-    required: true
-  version:
-    description: "Version to build"
-    required: true
-    example: "2023.12.0"
-  base_os:
-    description: "Base OS to use"
-    required: false
-    default: "debian"
-    example: "debian"
-runs:
-  using: "composite"
-  steps:
-    - name: Generate short tags
-      id: tags
-      shell: bash
-      run: |
-        output=$(docker/generate_tags.py \
-          --tag "${{ inputs.version }}" \
-          --suffix "${{ inputs.suffix }}")
-        echo $output
-        for l in $output; do
-          echo $l >> $GITHUB_OUTPUT
-        done
-
-    # set cache-to only if dev branch
-    - id: cache-to
-      shell: bash
-      run: |-
-        if [[ "${{ github.ref }}" == "refs/heads/dev" ]]; then
-          echo "value=type=gha,mode=max" >> $GITHUB_OUTPUT
-        else
-          echo "value=" >> $GITHUB_OUTPUT
-        fi
-
-    - name: Build and push to ghcr by digest
-      id: build-ghcr
-      uses: docker/build-push-action@v6.18.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
-      with:
-        context: .
-        file: ./docker/Dockerfile
-        target: ${{ inputs.target }}
-        cache-from: type=gha
-        cache-to: ${{ steps.cache-to.outputs.value }}
-        build-args: |
-          BUILD_TYPE=${{ inputs.build_type }}
-          BUILD_VERSION=${{ inputs.version }}
-          BUILD_OS=${{ inputs.base_os }}
-        outputs: |
-          type=image,name=ghcr.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
-
-    - name: Export ghcr digests
-      shell: bash
-      run: |
-        mkdir -p /tmp/digests/${{ inputs.build_type }}/ghcr
-        digest="${{ steps.build-ghcr.outputs.digest }}"
-        touch "/tmp/digests/${{ inputs.build_type }}/ghcr/${digest#sha256:}"
-
-    - name: Build and push to dockerhub by digest
-      id: build-dockerhub
-      uses: docker/build-push-action@v6.18.0
-      env:
-        DOCKER_BUILD_SUMMARY: false
-        DOCKER_BUILD_RECORD_UPLOAD: false
-      with:
-        context: .
-        file: ./docker/Dockerfile
-        target: ${{ inputs.target }}
-        cache-from: type=gha
-        cache-to: ${{ steps.cache-to.outputs.value }}
-        build-args: |
-          BUILD_TYPE=${{ inputs.build_type }}
-          BUILD_VERSION=${{ inputs.version }}
-          BUILD_OS=${{ inputs.base_os }}
-        outputs: |
-          type=image,name=docker.io/${{ steps.tags.outputs.image_name }},push-by-digest=true,name-canonical=true,push=true
-
-    - name: Export dockerhub digests
-      shell: bash
-      run: |
-        mkdir -p /tmp/digests/${{ inputs.build_type }}/dockerhub
-        digest="${{ steps.build-dockerhub.outputs.digest }}"
-        touch "/tmp/digests/${{ inputs.build_type }}/dockerhub/${digest#sha256:}"

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

@@ -1,47 +0,0 @@
-name: Restore Python
-inputs:
-  python-version:
-    description: Python version to restore
-    required: true
-    type: string
-  cache-key:
-    description: Cache key to use
-    required: true
-    type: string
-outputs:
-  python-version:
-    description: Python version restored
-    value: ${{ steps.python.outputs.python-version }}
-runs:
-  using: "composite"
-  steps:
-    - name: Set up Python ${{ inputs.python-version }}
-      id: python
-      uses: actions/setup-python@v5.6.0
-      with:
-        python-version: ${{ inputs.python-version }}
-    - name: Restore Python virtual environment
-      id: cache-venv
-      uses: actions/cache/restore@v4.2.3
-      with:
-        path: venv
-        # yamllint disable-line rule:line-length
-        key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ inputs.cache-key }}
-    - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os != 'Windows'
-      shell: bash
-      run: |
-        python -m venv venv
-        source venv/bin/activate
-        python --version
-        pip install -r requirements.txt -r requirements_test.txt
-        pip install -e .
-    - name: Create Python virtual environment
-      if: steps.cache-venv.outputs.cache-hit != 'true' && runner.os == 'Windows'
-      shell: bash
-      run: |
-        python -m venv venv
-        source ./venv/Scripts/activate
-        python --version
-        pip install -r requirements.txt -r requirements_test.txt
-        pip install -e .

.github/copilot-instructions.md

@@ -1 +0,0 @@
-../.ai/instructions.md

.github/dependabot.yml

@@ -9,32 +9,7 @@ updates:
       # Hypotehsis is only used for testing and is updated quite often
       - dependency-name: hypothesis
   - package-ecosystem: github-actions
-    labels:
-      - "dependencies"
-      - "github-actions"
     directory: "/"
     schedule:
       interval: daily
     open-pull-requests-limit: 10
-    groups:
-      docker-actions:
-        applies-to: version-updates
-        patterns:
-          - "docker/login-action"
-          - "docker/setup-buildx-action"
-  - package-ecosystem: github-actions
-    labels:
-      - "dependencies"
-      - "github-actions"
-    directory: "/.github/actions/build-image"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10
-  - package-ecosystem: github-actions
-    labels:
-      - "dependencies"
-      - "github-actions"
-    directory: "/.github/actions/restore-python"
-    schedule:
-      interval: daily
-    open-pull-requests-limit: 10

.github/workflows/auto-close-logs-in-problem.yml

@@ -1,248 +0,0 @@
-name: Auto-close issues with logs in problem field
-
-on:
-  issues:
-    types: [opened]
-  issue_comment:
-    types: [created]
-  workflow_dispatch:
-    inputs:
-      issue_number:
-        description: 'Issue number to check for logs'
-        required: true
-        type: number
-
-jobs:
-  check-logs-in-problem:
-    runs-on: ubuntu-latest
-    if: github.event.issue.state == 'open' || (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@esphomebot reopen')) || github.event_name == 'workflow_dispatch'
-    steps:
-      - name: Check for logs and handle issue state
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            // Handle different trigger types
-            let issue, isReassessment;
-
-            if (context.eventName === 'workflow_dispatch') {
-              // Manual dispatch - get issue from input
-              const issueNumber = ${{ github.event.inputs.issue_number }};
-              console.log('Manual dispatch for issue:', issueNumber);
-
-              const issueResponse = await github.rest.issues.get({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: parseInt(issueNumber)
-              });
-
-              issue = issueResponse.data;
-              isReassessment = false; // Treat manual dispatch as initial check
-            } else {
-              // Normal event-driven flow
-              issue = context.payload.issue;
-              isReassessment = context.eventName === 'issue_comment' && context.payload.comment.body.includes('@esphomebot reopen');
-            }
-
-            console.log('Event type:', context.eventName);
-            console.log('Is reassessment:', isReassessment);
-            console.log('Issue state:', issue.state);
-
-            // Extract the problem section from the issue body
-            const body = issue.body || '';
-
-            // Look for the problem section between "### The problem" and the next section
-            const problemMatch = body.match(/### The problem\s*\n([\s\S]*?)(?=\n### |$)/i);
-
-            if (!problemMatch) {
-              console.log('Could not find problem section');
-              if (isReassessment) {
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issue.number,
-                  body: '❌ Could not find the "The problem" section in the issue template. Please make sure you are using the proper issue template format.'
-                });
-              }
-              return;
-            }
-
-            const problemText = problemMatch[1].trim();
-            console.log('Problem text length:', problemText.length);
-
-            // Function to check if text contains logs
-            function checkForLogs(text) {
-              // Patterns that indicate logs/stack traces/error messages
-              const logPatterns = [
-                // ESPHome specific log patterns with brackets
-                /^\[[DIWEVC]\]\[[^\]]+(?::\d+)?\]:/m,     // [D][component:123]: message
-                /^\[\d{2}:\d{2}:\d{2}\]\[[DIWEVC]\]\[[^\]]+(?::\d+)?\]:/m, // [12:34:56][D][component:123]: message
-                /^\[\d{2}:\d{2}:\d{2}\.\d{3}\]\[[DIWEVC]\]\[[^\]]+(?::\d+)?\]:/m, // [12:34:56.123][D][component:123]: message
-
-                // Common log prefixes
-                /^\[[\d\s\-:\.]+\]/m,                    // [timestamp] format
-                /^\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}/m,  // YYYY-MM-DD HH:MM:SS
-                /^\w+\s+\d{2}:\d{2}:\d{2}/m,             // INFO 12:34:56
-
-                // Error indicators
-                /^(ERROR|WARN|WARNING|FATAL|DEBUG|INFO|TRACE)[\s:]/mi,
-                /^(Exception|Error|Traceback|Stack trace)/mi,
-                /at\s+[\w\.]+\([^)]*:\d+:\d+\)/m,        // Stack trace format
-                /^\s*File\s+"[^"]*",\s+line\s+\d+/m,     // Python traceback
-
-                // Legacy ESPHome log patterns
-                /^\[\d{2}:\d{2}:\d{2}\]\[/m,             // [12:34:56][component]
-                /^WARNING\s+[^:\s]+:/m,                  // WARNING component:
-                /^ERROR\s+[^:\s]+:/m,                    // ERROR component:
-
-                // Multiple consecutive lines starting with similar patterns
-                /(^(INFO|DEBUG|WARN|ERROR)[^\n]*\n){3,}/mi,
-                /(^\[[DIWEVC]\]\[[^\]]+\][^\n]*\n){3,}/mi, // Multiple ESPHome log lines
-
-                // Hex dumps or binary data
-                /0x[0-9a-f]{4,}/i,
-                /[0-9a-f]{8,}/,
-
-                // Compilation errors
-                /error:\s+/i,
-                /:\d+:\d+:\s+(error|warning):/i,
-
-                // Very long lines (often log output)
-                /.{200,}/
-              ];
-
-              const hasLogs = logPatterns.some(pattern => {
-                const matches = pattern.test(text);
-                if (matches) {
-                  console.log('Pattern matched:', pattern.toString());
-                }
-                return matches;
-              });
-
-              // Additional heuristics
-              const lineCount = text.split('\n').length;
-              const hasLotsOfLines = lineCount > 20; // More than 20 lines might be logs
-
-              const hasCodeBlocks = (text.match(/```/g) || []).length >= 2;
-              const longCodeBlock = hasCodeBlocks && text.length > 1000;
-
-              console.log(`Lines: ${lineCount}, Has logs: ${hasLogs}, Long code block: ${longCodeBlock}`);
-
-              return hasLogs || (hasLotsOfLines && longCodeBlock);
-            }
-
-            const hasLogsInProblem = checkForLogs(problemText);
-
-            // Handle reassessment (when @esphomebot is mentioned)
-            if (isReassessment) {
-              if (!hasLogsInProblem) {
-                // No logs found, check if issue was auto-closed and reopen it
-                if (issue.state === 'closed') {
-                  // Check if it has the auto-closed label
-                  const labels = issue.labels.map(label => label.name);
-                  if (labels.includes('auto-closed')) {
-                    console.log('Reopening issue - logs have been moved');
-
-                    await github.rest.issues.update({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issue.number,
-                      state: 'open'
-                    });
-
-                    // Remove auto-closed and invalid labels
-                    await github.rest.issues.removeLabel({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issue.number,
-                      name: 'auto-closed'
-                    });
-
-                    await github.rest.issues.removeLabel({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issue.number,
-                      name: 'invalid'
-                    });
-
-                    // Find and edit the original auto-close comment
-                    const comments = await github.rest.issues.listComments({
-                      owner: context.repo.owner,
-                      repo: context.repo.repo,
-                      issue_number: issue.number
-                    });
-
-                    const autoCloseComment = comments.data.find(comment =>
-                      comment.user.login === 'github-actions[bot]' &&
-                      comment.body.includes('automatically closed because it appears to contain logs')
-                    );
-
-                    if (autoCloseComment) {
-                      const updatedComment = `✅ **ISSUE REOPENED**
-
-                      Thank you for helping us maintain organized issue reports! 🙏`;
-
-                      await github.rest.issues.updateComment({
-                        owner: context.repo.owner,
-                        repo: context.repo.repo,
-                        comment_id: autoCloseComment.id,
-                        body: updatedComment
-                      });
-                    }
-                  }
-                }
-              } else {
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issue.number,
-                  body: '❌ Logs are still detected in the "The problem" section. Please move them to the "Logs" section and try again.'
-                });
-              }
-              return;
-            }
-
-            // Handle initial issue opening
-            if (!hasLogsInProblem) {
-              console.log('No logs detected in problem field');
-              return;
-            }
-
-            console.log('Logs detected in problem field, closing issue');
-
-            // Close the issue
-            await github.rest.issues.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issue.number,
-              state: 'closed'
-            });
-
-            // Add a comment explaining why it was closed
-            const comment = `This issue has been automatically closed because it appears to contain logs, stack traces, or error messages in the "The problem" field.
-
-            ⚠️ **Please follow the issue template correctly:**
-            - Use the "The problem" field to **describe** your issue in plain English
-            - Put logs, error messages, and stack traces in the "Logs" section instead
-
-            To reopen this issue:
-            1. Edit your original issue description
-            2. Move any logs/error messages to the appropriate "Logs" section
-            3. Rewrite the "The problem" section with a clear description of what you were trying to do and what went wrong
-            4. Comment exactly \`@esphomebot reopen\` to reassess and automatically reopen if fixed
-
-            Thank you for helping us maintain organized issue reports! 🙏`;
-
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issue.number,
-              body: comment
-            });
-
-            // Add labels
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: issue.number,
-              labels: ['invalid', 'auto-closed']
-            });

.github/workflows/auto-label-pr.yml

@@ -1,449 +0,0 @@
-name: Auto Label PR
-
-on:
-  # Runs only on pull_request_target due to having access to a App token.
-  # This means PRs from forks will not be able to alter this workflow to get the tokens
-  pull_request_target:
-    types: [labeled, opened, reopened, synchronize, edited]
-
-permissions:
-  pull-requests: write
-  contents: read
-
-env:
-  TARGET_PLATFORMS: |
-    esp32
-    esp8266
-    rp2040
-    libretiny
-    bk72xx
-    rtl87xx
-    ln882x
-    nrf52
-    host
-  PLATFORM_COMPONENTS: |
-    alarm_control_panel
-    audio_adc
-    audio_dac
-    binary_sensor
-    button
-    canbus
-    climate
-    cover
-    datetime
-    display
-    event
-    fan
-    light
-    lock
-    media_player
-    microphone
-    number
-    one_wire
-    ota
-    output
-    packet_transport
-    select
-    sensor
-    speaker
-    stepper
-    switch
-    text
-    text_sensor
-    time
-    touchscreen
-    update
-    valve
-  SMALL_PR_THRESHOLD: 30
-  MAX_LABELS: 15
-
-jobs:
-  label:
-    runs-on: ubuntu-latest
-    if: github.event.action != 'labeled' || github.event.sender.type != 'Bot'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-
-      - name: Get changes
-        id: changes
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          # Get PR number
-          pr_number="${{ github.event.pull_request.number }}"
-
-          # Get list of changed files using gh CLI
-          files=$(gh pr diff $pr_number --name-only)
-          echo "files<<EOF" >> $GITHUB_OUTPUT
-          echo "$files" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-          # Get file stats (additions + deletions) using gh CLI
-          stats=$(gh pr view $pr_number --json files --jq '.files | map(.additions + .deletions) | add')
-          echo "total_changes=${stats:-0}" >> $GITHUB_OUTPUT
-
-      - name: Generate a token
-        id: generate-token
-        uses: actions/create-github-app-token@v2
-        with:
-          app-id: ${{ secrets.ESPHOME_GITHUB_APP_ID }}
-          private-key: ${{ secrets.ESPHOME_GITHUB_APP_PRIVATE_KEY }}
-
-      - name: Auto Label PR
-        uses: actions/github-script@v7.0.1
-        with:
-          github-token: ${{ steps.generate-token.outputs.token }}
-          script: |
-            const fs = require('fs');
-
-            const { owner, repo } = context.repo;
-            const pr_number = context.issue.number;
-
-            // Get current labels
-            const { data: currentLabelsData } = await github.rest.issues.listLabelsOnIssue({
-              owner,
-              repo,
-              issue_number: pr_number
-            });
-            const currentLabels = currentLabelsData.map(label => label.name);
-
-            // Define managed labels that this workflow controls
-            const managedLabels = currentLabels.filter(label =>
-              label.startsWith('component: ') ||
-              [
-                'new-component',
-                'new-platform',
-                'new-target-platform',
-                'merging-to-release',
-                'merging-to-beta',
-                'core',
-                'small-pr',
-                'dashboard',
-                'github-actions',
-                'by-code-owner',
-                'has-tests',
-                'needs-tests',
-                'needs-docs',
-                'too-big',
-                'labeller-recheck'
-              ].includes(label)
-            );
-
-            console.log('Current labels:', currentLabels.join(', '));
-            console.log('Managed labels:', managedLabels.join(', '));
-
-            // Get changed files
-            const changedFiles = `${{ steps.changes.outputs.files }}`.split('\n').filter(f => f.length > 0);
-            const totalChanges = parseInt('${{ steps.changes.outputs.total_changes }}') || 0;
-
-            console.log('Changed files:', changedFiles.length);
-            console.log('Total changes:', totalChanges);
-
-            const labels = new Set();
-
-            // Get environment variables
-            const targetPlatforms = `${{ env.TARGET_PLATFORMS }}`.split('\n').filter(p => p.trim().length > 0).map(p => p.trim());
-            const platformComponents = `${{ env.PLATFORM_COMPONENTS }}`.split('\n').filter(p => p.trim().length > 0).map(p => p.trim());
-            const smallPrThreshold = parseInt('${{ env.SMALL_PR_THRESHOLD }}');
-            const maxLabels = parseInt('${{ env.MAX_LABELS }}');
-
-            // Strategy: Merge to release or beta branch
-            const baseRef = context.payload.pull_request.base.ref;
-            if (baseRef !== 'dev') {
-              if (baseRef === 'release') {
-                labels.add('merging-to-release');
-              } else if (baseRef === 'beta') {
-                labels.add('merging-to-beta');
-              }
-
-              // When targeting non-dev branches, only use merge warning labels
-              const finalLabels = Array.from(labels);
-              console.log('Computed labels (merge branch only):', finalLabels.join(', '));
-
-              // Add new labels
-              if (finalLabels.length > 0) {
-                console.log(`Adding labels: ${finalLabels.join(', ')}`);
-                await github.rest.issues.addLabels({
-                  owner,
-                  repo,
-                  issue_number: pr_number,
-                  labels: finalLabels
-                });
-              }
-
-              // Remove old managed labels that are no longer needed
-              const labelsToRemove = managedLabels.filter(label =>
-                !finalLabels.includes(label)
-              );
-
-              for (const label of labelsToRemove) {
-                console.log(`Removing label: ${label}`);
-                try {
-                  await github.rest.issues.removeLabel({
-                    owner,
-                    repo,
-                    issue_number: pr_number,
-                    name: label
-                  });
-                } catch (error) {
-                  console.log(`Failed to remove label ${label}:`, error.message);
-                }
-              }
-
-              return; // Exit early, don't process other strategies
-            }
-
-            // Strategy: Component and Platform labeling
-            const componentRegex = /^esphome\/components\/([^\/]+)\//;
-            const targetPlatformRegex = new RegExp(`^esphome\/components\/(${targetPlatforms.join('|')})/`);
-
-            for (const file of changedFiles) {
-              // Check for component changes
-              const componentMatch = file.match(componentRegex);
-              if (componentMatch) {
-                const component = componentMatch[1];
-                labels.add(`component: ${component}`);
-              }
-
-              // Check for target platform changes
-              const platformMatch = file.match(targetPlatformRegex);
-              if (platformMatch) {
-                const targetPlatform = platformMatch[1];
-                labels.add(`platform: ${targetPlatform}`);
-              }
-            }
-
-            // Get PR files for new component/platform detection
-            const { data: prFiles } = await github.rest.pulls.listFiles({
-              owner,
-              repo,
-              pull_number: pr_number
-            });
-
-            const addedFiles = prFiles.filter(file => file.status === 'added').map(file => file.filename);
-
-            // Strategy: New Component detection
-            for (const file of addedFiles) {
-              // Check for new component files: esphome/components/{component}/__init__.py
-              const componentMatch = file.match(/^esphome\/components\/([^\/]+)\/__init__\.py$/);
-              if (componentMatch) {
-                try {
-                  // Read the content directly from the filesystem since we have it checked out
-                  const content = fs.readFileSync(file, 'utf8');
-
-                  // Strategy: New Target Platform detection
-                  if (content.includes('IS_TARGET_PLATFORM = True')) {
-                    labels.add('new-target-platform');
-                  }
-                  labels.add('new-component');
-                } catch (error) {
-                  console.log(`Failed to read content of ${file}:`, error.message);
-                  // Fallback: assume it's a new component if we can't read the content
-                  labels.add('new-component');
-                }
-              }
-            }
-
-            // Strategy: New Platform detection
-            for (const file of addedFiles) {
-              // Check for new platform files: esphome/components/{component}/{platform}.py
-              const platformFileMatch = file.match(/^esphome\/components\/([^\/]+)\/([^\/]+)\.py$/);
-              if (platformFileMatch) {
-                const [, component, platform] = platformFileMatch;
-                if (platformComponents.includes(platform)) {
-                  labels.add('new-platform');
-                }
-              }
-
-              // Check for new platform files: esphome/components/{component}/{platform}/__init__.py
-              const platformDirMatch = file.match(/^esphome\/components\/([^\/]+)\/([^\/]+)\/__init__\.py$/);
-              if (platformDirMatch) {
-                const [, component, platform] = platformDirMatch;
-                if (platformComponents.includes(platform)) {
-                  labels.add('new-platform');
-                }
-              }
-            }
-
-            const coreFiles = changedFiles.filter(file =>
-              file.startsWith('esphome/core/') ||
-              (file.startsWith('esphome/') && file.split('/').length === 2)
-            );
-
-            if (coreFiles.length > 0) {
-              labels.add('core');
-            }
-
-            // Strategy: Small PR detection
-            if (totalChanges <= smallPrThreshold) {
-              labels.add('small-pr');
-            }
-
-            // Strategy: Dashboard changes
-            const dashboardFiles = changedFiles.filter(file =>
-              file.startsWith('esphome/dashboard/') ||
-              file.startsWith('esphome/components/dashboard_import/')
-            );
-
-            if (dashboardFiles.length > 0) {
-              labels.add('dashboard');
-            }
-
-            // Strategy: GitHub Actions changes
-            const githubActionsFiles = changedFiles.filter(file =>
-              file.startsWith('.github/workflows/')
-            );
-
-            if (githubActionsFiles.length > 0) {
-              labels.add('github-actions');
-            }
-
-            // Strategy: Code Owner detection
-            try {
-              // Fetch CODEOWNERS file from the repository (in case it was changed in this PR)
-              const { data: codeownersFile } = await github.rest.repos.getContent({
-                owner,
-                repo,
-                path: 'CODEOWNERS',
-              });
-
-              const codeownersContent = Buffer.from(codeownersFile.content, 'base64').toString('utf8');
-              const prAuthor = context.payload.pull_request.user.login;
-
-              // Parse CODEOWNERS file
-              const codeownersLines = codeownersContent.split('\n')
-                .map(line => line.trim())
-                .filter(line => line && !line.startsWith('#'));
-
-              let isCodeOwner = false;
-
-              // Precompile CODEOWNERS patterns into regex objects
-              const codeownersRegexes = codeownersLines.map(line => {
-                const parts = line.split(/\s+/);
-                const pattern = parts[0];
-                const owners = parts.slice(1);
-
-                let regex;
-                if (pattern.endsWith('*')) {
-                  // Directory pattern like "esphome/components/api/*"
-                  const dir = pattern.slice(0, -1);
-                  regex = new RegExp(`^${dir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`);
-                } else if (pattern.includes('*')) {
-                  // Glob pattern
-                  const regexPattern = pattern
-                    .replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-                    .replace(/\\*/g, '.*');
-                  regex = new RegExp(`^${regexPattern}$`);
-                } else {
-                  // Exact match
-                  regex = new RegExp(`^${pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}$`);
-                }
-
-                return { regex, owners };
-              });
-
-              for (const file of changedFiles) {
-                for (const { regex, owners } of codeownersRegexes) {
-                  if (regex.test(file)) {
-                    // Check if PR author is in the owners list
-                    if (owners.some(owner => owner === `@${prAuthor}`)) {
-                      isCodeOwner = true;
-                      break;
-                    }
-                  }
-                }
-                if (isCodeOwner) break;
-              }
-
-              if (isCodeOwner) {
-                labels.add('by-code-owner');
-              }
-            } catch (error) {
-              console.log('Failed to read or parse CODEOWNERS file:', error.message);
-            }
-
-            // Strategy: Test detection
-            const testFiles = changedFiles.filter(file =>
-              file.startsWith('tests/')
-            );
-
-            if (testFiles.length > 0) {
-              labels.add('has-tests');
-            } else {
-              // Only check for needs-tests if this is a new component or new platform
-              if (labels.has('new-component') || labels.has('new-platform')) {
-                labels.add('needs-tests');
-              }
-            }
-
-            // Strategy: Documentation check for new components/platforms
-            if (labels.has('new-component') || labels.has('new-platform')) {
-              const prBody = context.payload.pull_request.body || '';
-
-              // Look for documentation PR links
-              // Patterns to match:
-              // - https://github.com/esphome/esphome-docs/pull/1234
-              // - esphome/esphome-docs#1234
-              const docsPrPatterns = [
-                /https:\/\/github\.com\/esphome\/esphome-docs\/pull\/\d+/,
-                /esphome\/esphome-docs#\d+/
-              ];
-
-              const hasDocsLink = docsPrPatterns.some(pattern => pattern.test(prBody));
-
-              if (!hasDocsLink) {
-                labels.add('needs-docs');
-              }
-            }
-
-            // Convert Set to Array
-            let finalLabels = Array.from(labels);
-
-            console.log('Computed labels:', finalLabels.join(', '));
-
-            // Don't set more than max labels
-            if (finalLabels.length > maxLabels) {
-              const originalLength = finalLabels.length;
-              console.log(`Not setting ${originalLength} labels because out of range`);
-              finalLabels = ['too-big'];
-
-              // Request changes on the PR
-              await github.rest.pulls.createReview({
-                owner,
-                repo,
-                pull_number: pr_number,
-                body: `This PR is too large and affects ${originalLength} different components/areas. Please consider breaking it down into smaller, focused PRs to make review easier and reduce the risk of conflicts.`,
-                event: 'REQUEST_CHANGES'
-              });
-            }
-
-            // Add new labels
-            if (finalLabels.length > 0) {
-              console.log(`Adding labels: ${finalLabels.join(', ')}`);
-              await github.rest.issues.addLabels({
-                owner,
-                repo,
-                issue_number: pr_number,
-                labels: finalLabels
-              });
-            }
-
-            // Remove old managed labels that are no longer needed
-            const labelsToRemove = managedLabels.filter(label =>
-              !finalLabels.includes(label)
-            );
-
-            for (const label of labelsToRemove) {
-              console.log(`Removing label: ${label}`);
-              try {
-                await github.rest.issues.removeLabel({
-                  owner,
-                  repo,
-                  issue_number: pr_number,
-                  name: label
-                });
-              } catch (error) {
-                console.log(`Failed to remove label ${label}:`, error.message);
-              }
-            }

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

@@ -1,91 +0,0 @@
-name: API Proto CI
-
-on:
-  pull_request:
-    paths:
-      - "esphome/components/api/api.proto"
-      - "esphome/components/api/api_pb2.cpp"
-      - "esphome/components/api/api_pb2.h"
-      - "esphome/components/api/api_pb2_service.cpp"
-      - "esphome/components/api/api_pb2_service.h"
-      - "script/api_protobuf/api_protobuf.py"
-      - ".github/workflows/ci-api-proto.yml"
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  check:
-    name: Check generated files
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: "3.11"
-
-      - name: Install apt dependencies
-        run: |
-          sudo apt update
-          sudo apt-cache show protobuf-compiler
-          sudo apt install -y protobuf-compiler
-          protoc --version
-      - name: Install python dependencies
-        run: pip install aioesphomeapi -c requirements.txt -r requirements_dev.txt
-      - name: Generate files
-        run: script/api_protobuf/api_protobuf.py
-      - name: Check for changes
-        run: |
-          if ! git diff --quiet; then
-            echo "## Job Failed" | tee -a $GITHUB_STEP_SUMMARY
-            echo "You have altered the generated proto files but they do not match what is expected." | tee -a $GITHUB_STEP_SUMMARY
-            echo "Please run 'script/api_protobuf/api_protobuf.py' and commit the changes." | tee -a $GITHUB_STEP_SUMMARY
-            exit 1
-          fi
-      - if: failure()
-        name: Review PR
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            await github.rest.pulls.createReview({
-              pull_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              event: 'REQUEST_CHANGES',
-              body: 'You have altered the generated proto files but they do not match what is expected.\nPlease run "script/api_protobuf/api_protobuf.py" and commit the changes.'
-            })
-      - if: failure()
-        name: Show changes
-        run: git diff
-      - if: failure()
-        name: Archive artifacts
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: generated-proto-files
-          path: |
-            esphome/components/api/api_pb2.*
-            esphome/components/api/api_pb2_service.*
-      - if: success()
-        name: Dismiss review
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            let reviews = await github.rest.pulls.listReviews({
-              pull_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            for (let review of reviews.data) {
-              if (review.user.login === 'github-actions[bot]' && review.state === 'CHANGES_REQUESTED') {
-                await github.rest.pulls.dismissReview({
-                  pull_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  review_id: review.id,
-                  message: 'Files now match the expected proto files.'
-                });
-              }
-            }

.github/workflows/ci-clang-tidy-hash.yml

@@ -1,75 +0,0 @@
-name: Clang-tidy Hash CI
-
-on:
-  pull_request:
-    paths:
-      - ".clang-tidy"
-      - "platformio.ini"
-      - "requirements_dev.txt"
-      - ".clang-tidy.hash"
-      - "script/clang_tidy_hash.py"
-      - ".github/workflows/ci-clang-tidy-hash.yml"
-
-permissions:
-  contents: read
-  pull-requests: write
-
-jobs:
-  verify-hash:
-    name: Verify clang-tidy hash
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-
-      - name: Set up Python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: "3.11"
-
-      - name: Verify hash
-        run: |
-          python script/clang_tidy_hash.py --verify
-
-      - if: failure()
-        name: Show hash details
-        run: |
-          python script/clang_tidy_hash.py
-          echo "## Job Failed" | tee -a $GITHUB_STEP_SUMMARY
-          echo "You have modified clang-tidy configuration but have not updated the hash." | tee -a $GITHUB_STEP_SUMMARY
-          echo "Please run 'script/clang_tidy_hash.py --update' and commit the changes." | tee -a $GITHUB_STEP_SUMMARY
-
-      - if: failure()
-        name: Request changes
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            await github.rest.pulls.createReview({
-              pull_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              event: 'REQUEST_CHANGES',
-              body: 'You have modified clang-tidy configuration but have not updated the hash.\nPlease run `script/clang_tidy_hash.py --update` and commit the changes.'
-            })
-
-      - if: success()
-        name: Dismiss review
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            let reviews = await github.rest.pulls.listReviews({
-              pull_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            });
-            for (let review of reviews.data) {
-              if (review.user.login === 'github-actions[bot]' && review.state === 'CHANGES_REQUESTED') {
-                await github.rest.pulls.dismissReview({
-                  pull_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  review_id: review.id,
-                  message: 'Clang-tidy hash now matches configuration.'
-                });
-              }
-            }

.github/workflows/ci-docker.yml

@@ -2,54 +2,46 @@
 name: CI for docker images
 
 # Only run when docker paths change
-
+# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
-      - "script/platformio_install_deps.py"
 
   pull_request:
     paths:
       - "docker/**"
-      - ".github/workflows/ci-docker.yml"
+      - ".github/workflows/**"
       - "requirements*.txt"
       - "platformio.ini"
-      - "script/platformio_install_deps.py"
 
 permissions:
   contents: read
   packages: read
 
-concurrency:
-  # yamllint disable-line rule:line-length
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
-  cancel-in-progress: true
-
 jobs:
   check-docker:
     name: Build docker containers
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: ["ubuntu-24.04", "ubuntu-24.04-arm"]
-        build_type:
-          - "ha-addon"
-          - "docker"
-          # - "lint"
+        arch: [amd64, armv7, aarch64]
+        build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.9"
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Set TAG
         run: |
@@ -59,6 +51,6 @@ jobs:
         run: |
           docker/build.py \
             --tag "${TAG}" \
-            --arch "${{ matrix.os == 'ubuntu-24.04-arm' && 'aarch64' || 'amd64' }}" \
+            --arch "${{ matrix.arch }}" \
             --build-type "${{ matrix.build_type }}" \
             build

.github/workflows/ci.yml

@@ -1,260 +1,65 @@
 ---
 name: CI
 
+# yamllint disable-line rule:truthy
 on:
   push:
     branches: [dev, beta, release]
 
   pull_request:
-    paths:
-      - "**"
-      - "!.github/workflows/*.yml"
-      - "!.github/actions/build-image/*"
-      - ".github/workflows/ci.yml"
-      - "!.yamllint"
-      - "!.github/dependabot.yml"
-      - "!docker/**"
-  merge_group:
 
 permissions:
   contents: read
 
-env:
-  DEFAULT_PYTHON: "3.11"
-  PYUPGRADE_TARGET: "--py311-plus"
-
 concurrency:
   # yamllint disable-line rule:line-length
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 
 jobs:
-  common:
-    name: Create common environment
-    runs-on: ubuntu-24.04
-    outputs:
-      cache-key: ${{ steps.cache-key.outputs.key }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Generate cache-key
-        id: cache-key
-        run: echo key="${{ hashFiles('requirements.txt', 'requirements_test.txt', '.pre-commit-config.yaml') }}" >> $GITHUB_OUTPUT
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        id: python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.2.3
-        with:
-          path: venv
-          # yamllint disable-line rule:line-length
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ steps.cache-key.outputs.key }}
-      - name: Create Python virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          python -m venv venv
-          . venv/bin/activate
-          python --version
-          pip install -r requirements.txt -r requirements_test.txt pre-commit
-          pip install -e .
-
-  pylint:
-    name: Check pylint
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.python-linters == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Run pylint
-        run: |
-          . venv/bin/activate
-          pylint -f parseable --persistent=n esphome
-      - name: Suggested changes
-        run: script/ci-suggest-changes
-        if: always()
-
-  ci-custom:
-    name: Run script/ci-custom
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
-      - name: Run script/ci-custom
-        run: |
-          . venv/bin/activate
-          script/ci-custom.py
-          script/build_codeowners.py --check
-          script/build_language_schema.py --check
-
-  pytest:
-    name: Run pytest
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-          - "3.11"
-          - "3.12"
-          - "3.13"
-        os:
-          - ubuntu-latest
-          - macOS-latest
-          - windows-latest
-        exclude:
-          # Minimize CI resource usage
-          # by only running the Python version
-          # version used for docker images on Windows and macOS
-          - python-version: "3.13"
-            os: windows-latest
-          - python-version: "3.12"
-            os: windows-latest
-          - python-version: "3.13"
-            os: macOS-latest
-          - python-version: "3.12"
-            os: macOS-latest
-    runs-on: ${{ matrix.os }}
-    needs:
-      - common
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        id: restore-python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ matrix.python-version }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run pytest
-        if: matrix.os == 'windows-latest'
-        run: |
-          . ./venv/Scripts/activate.ps1
-          pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
-      - name: Run pytest
-        if: matrix.os == 'ubuntu-latest' || matrix.os == 'macOS-latest'
-        run: |
-          . venv/bin/activate
-          pytest -vv --cov-report=xml --tb=native -n auto tests --ignore=tests/integration/
-      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.4.3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-      - name: Save Python virtual environment cache
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache/save@v4.2.3
-        with:
-          path: venv
-          key: ${{ runner.os }}-${{ steps.restore-python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
-
-  determine-jobs:
-    name: Determine which jobs to run
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-    outputs:
-      integration-tests: ${{ steps.determine.outputs.integration-tests }}
-      clang-tidy: ${{ steps.determine.outputs.clang-tidy }}
-      python-linters: ${{ steps.determine.outputs.python-linters }}
-      changed-components: ${{ steps.determine.outputs.changed-components }}
-      component-test-count: ${{ steps.determine.outputs.component-test-count }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-        with:
-          # Fetch enough history to find the merge base
-          fetch-depth: 2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Determine which tests to run
-        id: determine
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          . venv/bin/activate
-          output=$(python script/determine-jobs.py)
-          echo "Test determination output:"
-          echo "$output" | jq
-
-          # Extract individual fields
-          echo "integration-tests=$(echo "$output" | jq -r '.integration_tests')" >> $GITHUB_OUTPUT
-          echo "clang-tidy=$(echo "$output" | jq -r '.clang_tidy')" >> $GITHUB_OUTPUT
-          echo "python-linters=$(echo "$output" | jq -r '.python_linters')" >> $GITHUB_OUTPUT
-          echo "changed-components=$(echo "$output" | jq -c '.changed_components')" >> $GITHUB_OUTPUT
-          echo "component-test-count=$(echo "$output" | jq -r '.component_test_count')" >> $GITHUB_OUTPUT
-
-  integration-tests:
-    name: Run integration tests
-    runs-on: ubuntu-latest
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.integration-tests == 'true'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python 3.13
-        id: python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: "3.13"
-      - name: Restore Python virtual environment
-        id: cache-venv
-        uses: actions/cache@v4.2.3
-        with:
-          path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{ needs.common.outputs.cache-key }}
-      - name: Create Python virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          python -m venv venv
-          . venv/bin/activate
-          python --version
-          pip install -r requirements.txt -r requirements_test.txt
-          pip install -e .
-      - name: Register matcher
-        run: echo "::add-matcher::.github/workflows/matchers/pytest.json"
-      - name: Run integration tests
-        run: |
-          . venv/bin/activate
-          pytest -vv --no-cov --tb=native -n auto tests/integration/
-
-  clang-tidy:
+  ci:
     name: ${{ matrix.name }}
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: needs.determine-jobs.outputs.clang-tidy == 'true'
-    env:
-      GH_TOKEN: ${{ github.token }}
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      max-parallel: 2
       matrix:
         include:
+          - id: ci-custom
+            name: Run script/ci-custom
+          - id: lint-python
+            name: Run script/lint-python
+          - id: test
+            file: tests/test1.yaml
+            name: Test tests/test1.yaml
+            pio_cache_key: test1
+          - id: test
+            file: tests/test2.yaml
+            name: Test tests/test2.yaml
+            pio_cache_key: test2
+          - id: test
+            file: tests/test3.yaml
+            name: Test tests/test3.yaml
+            pio_cache_key: test3
+          - id: test
+            file: tests/test4.yaml
+            name: Test tests/test4.yaml
+            pio_cache_key: test4
+          - id: test
+            file: tests/test5.yaml
+            name: Test tests/test5.yaml
+            pio_cache_key: test5
+          - id: test
+            file: tests/test6.yaml
+            name: Test tests/test6.yaml
+            pio_cache_key: test6
+          - id: test
+            file: tests/test7.yaml
+            name: Test tests/test7.yaml
+            pio_cache_key: test7
+          - id: pytest
+            name: Run pytest
+          - id: clang-format
+            name: Run script/clang-format
           - id: clang-tidy
             name: Run script/clang-tidy for ESP8266
             options: --environment esp8266-arduino-tidy --grep USE_ESP8266
@@ -279,222 +84,106 @@ jobs:
             name: Run script/clang-tidy for ESP32 IDF
             options: --environment esp32-idf-tidy --grep USE_ESP_IDF
             pio_cache_key: tidyesp32-idf
-          - id: clang-tidy
-            name: Run script/clang-tidy for ZEPHYR
-            options: --environment nrf52-tidy --grep USE_ZEPHYR
-            pio_cache_key: tidy-zephyr
-            ignore_errors: false
+          - id: yamllint
+            name: Run yamllint
 
     steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        id: python
         with:
-          # Need history for HEAD~1 to work for checking changed files
-          fetch-depth: 2
+          python-version: "3.9"
 
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
+      - name: Cache virtualenv
+        uses: actions/cache@v3
         with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
+          path: .venv
+          # yamllint disable-line rule:line-length
+          key: venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements*.txt') }}
+          restore-keys: |
+            venv-${{ steps.python.outputs.python-version }}-
 
+      - name: Set up virtualenv
+        # yamllint disable rule:line-length
+        run: |
+          python -m venv .venv
+          source .venv/bin/activate
+          pip install -U pip
+          pip install -r requirements.txt -r requirements_optional.txt -r requirements_test.txt
+          pip install -e .
+          echo "$GITHUB_WORKSPACE/.venv/bin" >> $GITHUB_PATH
+          echo "VIRTUAL_ENV=$GITHUB_WORKSPACE/.venv" >> $GITHUB_ENV
+        # yamllint enable rule:line-length
+
+      # Use per check platformio cache because checks use different parts
       - name: Cache platformio
-        if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v3
         with:
           path: ~/.platformio
+          # yamllint disable-line rule:line-length
           key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
+        if: matrix.id == 'test' || matrix.id == 'clang-tidy'
 
-      - name: Cache platformio
-        if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.2.3
-        with:
-          path: ~/.platformio
-          key: platformio-${{ matrix.pio_cache_key }}-${{ hashFiles('platformio.ini') }}
+      - name: Install clang tools
+        run: |
+          sudo apt-get install \
+              clang-format-11 \
+              clang-tidy-11
+        if: matrix.id == 'clang-tidy' || matrix.id == 'clang-format'
 
       - name: Register problem matchers
         run: |
+          echo "::add-matcher::.github/workflows/matchers/ci-custom.json"
+          echo "::add-matcher::.github/workflows/matchers/lint-python.json"
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+          echo "::add-matcher::.github/workflows/matchers/pytest.json"
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
 
-      - name: Run 'pio run --list-targets -e esp32-idf-tidy'
-        if: matrix.name == 'Run script/clang-tidy for ESP32 IDF'
+      - name: Lint Custom
         run: |
-          . venv/bin/activate
-          mkdir -p .temp
-          pio run --list-targets -e esp32-idf-tidy
+          script/ci-custom.py
+          script/build_codeowners.py --check
+        if: matrix.id == 'ci-custom'
 
-      - name: Check if full clang-tidy scan needed
-        id: check_full_scan
-        run: |
-          . venv/bin/activate
-          if python script/clang_tidy_hash.py --check; then
-            echo "full_scan=true" >> $GITHUB_OUTPUT
-            echo "reason=hash_changed" >> $GITHUB_OUTPUT
-          else
-            echo "full_scan=false" >> $GITHUB_OUTPUT
-            echo "reason=normal" >> $GITHUB_OUTPUT
-          fi
+      - name: Lint Python
+        run: script/lint-python -a
+        if: matrix.id == 'lint-python'
 
-      - name: Run clang-tidy
-        run: |
-          . venv/bin/activate
-          if [ "${{ steps.check_full_scan.outputs.full_scan }}" = "true" ]; then
-            echo "Running FULL clang-tidy scan (hash changed)"
-            script/clang-tidy --all-headers --fix ${{ matrix.options }} ${{ matrix.ignore_errors && '|| true' || '' }}
-          else
-            echo "Running clang-tidy on changed files only"
-            script/clang-tidy --all-headers --fix --changed ${{ matrix.options }} ${{ matrix.ignore_errors && '|| true' || '' }}
-          fi
+      - run: esphome compile ${{ matrix.file }}
+        if: matrix.id == 'test'
         env:
           # Also cache libdeps, store them in a ~/.platformio subfolder
           PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
 
+      - name: Run pytest
+        run: |
+          pytest -vv --tb=native tests
+        if: matrix.id == 'pytest'
+
+      # Also run git-diff-index so that the step is marked as failed on
+      # formatting errors, since clang-format doesn't do anything but
+      # change files if -i is passed.
+      - name: Run clang-format
+        run: |
+          script/clang-format -i
+          git diff-index --quiet HEAD --
+        if: matrix.id == 'clang-format'
+
+      - name: Run clang-tidy
+        run: |
+          script/clang-tidy --all-headers --fix ${{ matrix.options }}
+        if: matrix.id == 'clang-tidy'
+        env:
+          # Also cache libdeps, store them in a ~/.platformio subfolder
+          PLATFORMIO_LIBDEPS_DIR: ~/.platformio/libdeps
+
+      - name: Run yamllint
+        if: matrix.id == 'yamllint'
+        uses: frenck/action-yamllint@v1.3.1
+
       - name: Suggested changes
-        run: script/ci-suggest-changes ${{ matrix.ignore_errors && '|| true' || '' }}
+        run: script/ci-suggest-changes
         # yamllint disable-line rule:line-length
-        if: always()
-
-  test-build-components:
-    name: Component test ${{ matrix.file }}
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.component-test-count) > 0 && fromJSON(needs.determine-jobs.outputs.component-test-count) < 100
-    strategy:
-      fail-fast: false
-      max-parallel: 2
-      matrix:
-        file: ${{ fromJson(needs.determine-jobs.outputs.changed-components) }}
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsdl2-dev
-
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: test_build_components -e config -c ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          ./script/test_build_components -e config -c ${{ matrix.file }}
-      - name: test_build_components -e compile -c ${{ matrix.file }}
-        run: |
-          . venv/bin/activate
-          ./script/test_build_components -e compile -c ${{ matrix.file }}
-
-  test-build-components-splitter:
-    name: Split components for testing into 20 groups maximum
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.component-test-count) >= 100
-    outputs:
-      matrix: ${{ steps.split.outputs.components }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Split components into 20 groups
-        id: split
-        run: |
-          components=$(echo '${{ needs.determine-jobs.outputs.changed-components }}' | jq -c '.[]' | shuf | jq -s -c '[_nwise(20) | join(" ")]')
-          echo "components=$components" >> $GITHUB_OUTPUT
-
-  test-build-components-split:
-    name: Test split components
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - determine-jobs
-      - test-build-components-splitter
-    if: github.event_name == 'pull_request' && fromJSON(needs.determine-jobs.outputs.component-test-count) >= 100
-    strategy:
-      fail-fast: false
-      max-parallel: 4
-      matrix:
-        components: ${{ fromJson(needs.test-build-components-splitter.outputs.matrix) }}
-    steps:
-      - name: List components
-        run: echo ${{ matrix.components }}
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsdl2-dev
-
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - name: Validate config
-        run: |
-          . venv/bin/activate
-          for component in ${{ matrix.components }}; do
-            ./script/test_build_components -e config -c $component
-          done
-      - name: Compile config
-        run: |
-          . venv/bin/activate
-          mkdir build_cache
-          export PLATFORMIO_BUILD_CACHE_DIR=$PWD/build_cache
-          for component in ${{ matrix.components }}; do
-            ./script/test_build_components -e compile -c $component
-          done
-
-  pre-commit-ci-lite:
-    name: pre-commit.ci lite
-    runs-on: ubuntu-latest
-    needs:
-      - common
-    if: github.event_name == 'pull_request' && github.base_ref != 'beta' && github.base_ref != 'release'
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Restore Python
-        uses: ./.github/actions/restore-python
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          cache-key: ${{ needs.common.outputs.cache-key }}
-      - uses: pre-commit/action@v3.0.1
-        env:
-          SKIP: pylint,clang-tidy-hash
-      - uses: pre-commit-ci/lite-action@v1.1.0
-        if: always()
-
-  ci-status:
-    name: CI Status
-    runs-on: ubuntu-24.04
-    needs:
-      - common
-      - ci-custom
-      - pylint
-      - pytest
-      - integration-tests
-      - clang-tidy
-      - determine-jobs
-      - test-build-components
-      - test-build-components-splitter
-      - test-build-components-split
-      - pre-commit-ci-lite
-    if: always()
-    steps:
-      - name: Success
-        if: ${{ !(contains(needs.*.result, 'failure')) }}
-        run: exit 0
-      - name: Failure
-        if: ${{ contains(needs.*.result, 'failure') }}
-        env:
-          JSON_DOC: ${{ toJSON(needs) }}
-        run: |
-          echo $JSON_DOC | jq
-          exit 1
+        if: always() && (matrix.id == 'clang-tidy' || matrix.id == 'clang-format' || matrix.id == 'lint-python')

.github/workflows/codeowner-review-request.yml

@@ -1,264 +0,0 @@
-# This workflow automatically requests reviews from codeowners when:
-# 1. A PR is opened, reopened, or synchronized (updated)
-# 2. A PR is marked as ready for review
-#
-# It reads the CODEOWNERS file and matches all changed files in the PR against
-# the codeowner patterns, then requests reviews from the appropriate owners
-# while avoiding duplicate requests for users who have already been requested
-# or have already reviewed the PR.
-
-name: Request Codeowner Reviews
-
-on:
-  # Needs to be pull_request_target to get write permissions
-  pull_request_target:
-    types: [opened, reopened, synchronize, ready_for_review]
-
-permissions:
-  pull-requests: write
-  contents: read
-
-jobs:
-  request-codeowner-reviews:
-    name: Run
-    if: ${{ !github.event.pull_request.draft }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Request reviews from component codeowners
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const pr_number = context.payload.pull_request.number;
-
-            console.log(`Processing PR #${pr_number} for codeowner review requests`);
-
-            try {
-              // Get the list of changed files in this PR
-              const { data: files } = await github.rest.pulls.listFiles({
-                owner,
-                repo,
-                pull_number: pr_number
-              });
-
-              const changedFiles = files.map(file => file.filename);
-              console.log(`Found ${changedFiles.length} changed files`);
-
-              if (changedFiles.length === 0) {
-                console.log('No changed files found, skipping codeowner review requests');
-                return;
-              }
-
-              // Fetch CODEOWNERS file from root
-              const { data: codeownersFile } = await github.rest.repos.getContent({
-                owner,
-                repo,
-                path: 'CODEOWNERS',
-                ref: context.payload.pull_request.base.sha
-              });
-              const codeownersContent = Buffer.from(codeownersFile.content, 'base64').toString('utf8');
-
-              // Parse CODEOWNERS file to extract all patterns and their owners
-              const codeownersLines = codeownersContent.split('\n')
-                .map(line => line.trim())
-                .filter(line => line && !line.startsWith('#'));
-
-              const codeownersPatterns = [];
-
-              // Convert CODEOWNERS pattern to regex (robust glob handling)
-              function globToRegex(pattern) {
-                // Escape regex special characters except for glob wildcards
-                let regexStr = pattern
-                  .replace(/([.+^=!:${}()|[\]\\])/g, '\\$1') // escape regex chars
-                  .replace(/\*\*/g, '.*') // globstar
-                  .replace(/\*/g, '[^/]*') // single star
-                  .replace(/\?/g, '.'); // question mark
-                return new RegExp('^' + regexStr + '$');
-              }
-
-              // Helper function to create comment body
-              function createCommentBody(reviewersList, teamsList, matchedFileCount, isSuccessful = true) {
-                const reviewerMentions = reviewersList.map(r => `@${r}`);
-                const teamMentions = teamsList.map(t => `@${owner}/${t}`);
-                const allMentions = [...reviewerMentions, ...teamMentions].join(', ');
-
-                if (isSuccessful) {
-                  return `👋 Hi there! I've automatically requested reviews from codeowners based on the files changed in this PR.\n\n${allMentions} - You've been requested to review this PR as codeowner(s) of ${matchedFileCount} file(s) that were modified. Thanks for your time! 🙏`;
-                } else {
-                  return `👋 Hi there! This PR modifies ${matchedFileCount} file(s) with codeowners.\n\n${allMentions} - As codeowner(s) of the affected files, your review would be appreciated! 🙏\n\n_Note: Automatic review request may have failed, but you're still welcome to review._`;
-                }
-              }
-
-              for (const line of codeownersLines) {
-                const parts = line.split(/\s+/);
-                if (parts.length < 2) continue;
-
-                const pattern = parts[0];
-                const owners = parts.slice(1);
-
-                // Use robust glob-to-regex conversion
-                const regex = globToRegex(pattern);
-                codeownersPatterns.push({ pattern, regex, owners });
-              }
-
-              console.log(`Parsed ${codeownersPatterns.length} codeowner patterns`);
-
-              // Match changed files against CODEOWNERS patterns
-              const matchedOwners = new Set();
-              const matchedTeams = new Set();
-              const fileMatches = new Map(); // Track which files matched which patterns
-
-              for (const file of changedFiles) {
-                for (const { pattern, regex, owners } of codeownersPatterns) {
-                  if (regex.test(file)) {
-                    console.log(`File '${file}' matches pattern '${pattern}' with owners: ${owners.join(', ')}`);
-
-                    if (!fileMatches.has(file)) {
-                      fileMatches.set(file, []);
-                    }
-                    fileMatches.get(file).push({ pattern, owners });
-
-                    // Add owners to the appropriate set (remove @ prefix)
-                    for (const owner of owners) {
-                      const cleanOwner = owner.startsWith('@') ? owner.slice(1) : owner;
-                      if (cleanOwner.includes('/')) {
-                        // Team mention (org/team-name)
-                        const teamName = cleanOwner.split('/')[1];
-                        matchedTeams.add(teamName);
-                      } else {
-                        // Individual user
-                        matchedOwners.add(cleanOwner);
-                      }
-                    }
-                  }
-                }
-              }
-
-              if (matchedOwners.size === 0 && matchedTeams.size === 0) {
-                console.log('No codeowners found for any changed files');
-                return;
-              }
-
-              // Remove the PR author from reviewers
-              const prAuthor = context.payload.pull_request.user.login;
-              matchedOwners.delete(prAuthor);
-
-              // Get current reviewers to avoid duplicate requests (but still mention them)
-              const { data: prData } = await github.rest.pulls.get({
-                owner,
-                repo,
-                pull_number: pr_number
-              });
-
-              const currentReviewers = new Set();
-              const currentTeams = new Set();
-
-              if (prData.requested_reviewers) {
-                prData.requested_reviewers.forEach(reviewer => {
-                  currentReviewers.add(reviewer.login);
-                });
-              }
-
-              if (prData.requested_teams) {
-                prData.requested_teams.forEach(team => {
-                  currentTeams.add(team.slug);
-                });
-              }
-
-              // Check for completed reviews to avoid re-requesting users who have already reviewed
-              const { data: reviews } = await github.rest.pulls.listReviews({
-                owner,
-                repo,
-                pull_number: pr_number
-              });
-
-              const reviewedUsers = new Set();
-              reviews.forEach(review => {
-                reviewedUsers.add(review.user.login);
-              });
-
-              // Remove only users who have already submitted reviews (not just requested reviewers)
-              reviewedUsers.forEach(reviewer => {
-                matchedOwners.delete(reviewer);
-              });
-
-              // For teams, we'll still remove already requested teams to avoid API errors
-              currentTeams.forEach(team => {
-                matchedTeams.delete(team);
-              });
-
-              const reviewersList = Array.from(matchedOwners);
-              const teamsList = Array.from(matchedTeams);
-
-              if (reviewersList.length === 0 && teamsList.length === 0) {
-                console.log('No eligible reviewers found (all may already be requested or reviewed)');
-                return;
-              }
-
-              const totalReviewers = reviewersList.length + teamsList.length;
-              console.log(`Requesting reviews from ${reviewersList.length} users and ${teamsList.length} teams for ${fileMatches.size} matched files`);
-
-              // Request reviews
-              try {
-                const requestParams = {
-                  owner,
-                  repo,
-                  pull_number: pr_number
-                };
-
-                // Filter out users who are already requested reviewers for the API call
-                const newReviewers = reviewersList.filter(reviewer => !currentReviewers.has(reviewer));
-                const newTeams = teamsList.filter(team => !currentTeams.has(team));
-
-                if (newReviewers.length > 0) {
-                  requestParams.reviewers = newReviewers;
-                }
-
-                if (newTeams.length > 0) {
-                  requestParams.team_reviewers = newTeams;
-                }
-
-                // Only make the API call if there are new reviewers to request
-                if (newReviewers.length > 0 || newTeams.length > 0) {
-                  await github.rest.pulls.requestReviewers(requestParams);
-                  console.log(`Successfully requested reviews from ${newReviewers.length} new users and ${newTeams.length} new teams`);
-                } else {
-                  console.log('All codeowners are already requested reviewers or have reviewed');
-                }
-
-                // Add a comment to the PR mentioning what happened (include all matched codeowners)
-                const commentBody = createCommentBody(reviewersList, teamsList, fileMatches.size, true);
-
-                await github.rest.issues.createComment({
-                  owner,
-                  repo,
-                  issue_number: pr_number,
-                  body: commentBody
-                });
-              } catch (error) {
-                if (error.status === 422) {
-                  console.log('Some reviewers may already be requested or unavailable:', error.message);
-
-                  // Try to add a comment even if review request failed
-                  const commentBody = createCommentBody(reviewersList, teamsList, fileMatches.size, false);
-
-                  try {
-                    await github.rest.issues.createComment({
-                      owner,
-                      repo,
-                      issue_number: pr_number,
-                      body: commentBody
-                    });
-                  } catch (commentError) {
-                    console.log('Failed to add comment:', commentError.message);
-                  }
-                } else {
-                  throw error;
-                }
-              }
-
-            } catch (error) {
-              console.log('Failed to process codeowner review requests:', error.message);
-              console.error(error);
-            }

.github/workflows/codeql.yml

@@ -1,91 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL Advanced"
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "30 18 * * 4"
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # - language: c-cpp
-          #   build-mode: autobuild
-          - language: python
-            build-mode: none
-            # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
-            # Use `c-cpp` to analyze code written in C, C++ or both
-            # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-            # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-            # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-            # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-            # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-            # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: ${{ matrix.language }}
-          build-mode: ${{ matrix.build-mode }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          # queries: security-extended,security-and-quality
-
-      # If the analyze step fails for one of the languages you are analyzing with
-      # "We were unable to automatically build your code", modify the matrix above
-      # to set the build mode to "manual" for that language. Then modify this step
-      # to build your code.
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-      - if: matrix.build-mode == 'manual'
-        shell: bash
-        run: |
-          echo 'If you are using a "manual" build mode for one or more of the' \
-            'languages you are analyzing, replace this with the commands to build' \
-            'your code, for example:'
-          echo '  make bootstrap'
-          echo '  make release'
-          exit 1
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
-        with:
-          category: "/language:${{matrix.language}}"

.github/workflows/external-component-bot.yml

@@ -1,147 +0,0 @@
-name: Add External Component Comment
-
-on:
-  pull_request_target:
-    types: [opened, synchronize]
-
-permissions:
-  contents: read       #  Needed to fetch PR details
-  issues: write        #  Needed to create and update comments (PR comments are managed via the issues REST API)
-  pull-requests: write  # also needed?
-
-jobs:
-  external-comment:
-    name: External component comment
-    runs-on: ubuntu-latest
-    steps:
-      - name: Add external component comment
-        uses: actions/github-script@v7.0.1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            // Generate external component usage instructions
-            function generateExternalComponentInstructions(prNumber, componentNames, owner, repo) {
-                let source;
-                if (owner === 'esphome' && repo === 'esphome')
-                    source = `github://pr#${prNumber}`;
-                else
-                    source = `github://${owner}/${repo}@pull/${prNumber}/head`;
-                return `To use the changes from this PR as an external component, add the following to your ESPHome configuration YAML file:
-
-            \`\`\`yaml
-            external_components:
-              - source: ${source}
-                components: [${componentNames.join(', ')}]
-                refresh: 1h
-            \`\`\``;
-            }
-
-            // Generate repo clone instructions
-            function generateRepoInstructions(prNumber, owner, repo, branch) {
-                return `To use the changes in this PR:
-
-            \`\`\`bash
-            # Clone the repository:
-            git clone https://github.com/${owner}/${repo}
-            cd ${repo}
-
-            # Checkout the PR branch:
-            git fetch origin pull/${prNumber}/head:${branch}
-            git checkout ${branch}
-
-            # Install the development version:
-            script/setup
-
-            # Activate the development version:
-            source venv/bin/activate
-            \`\`\`
-
-            Now you can run \`esphome\` as usual to test the changes in this PR.
-            `;
-            }
-
-            async function createComment(octokit, owner, repo, prNumber, esphomeChanges, componentChanges) {
-                const commentMarker = "<!-- This comment was generated automatically by a GitHub workflow. -->";
-                let commentBody;
-                if (esphomeChanges.length === 1) {
-                    commentBody = generateExternalComponentInstructions(prNumber, componentChanges, owner, repo);
-                } else {
-                    commentBody = generateRepoInstructions(prNumber, owner, repo, context.payload.pull_request.head.ref);
-                }
-                commentBody += `\n\n---\n(Added by the PR bot)\n\n${commentMarker}`;
-
-                // Check for existing bot comment
-                const comments = await github.rest.issues.listComments({
-                    owner: owner,
-                    repo: repo,
-                    issue_number: prNumber,
-                });
-
-                const botComment = comments.data.find(comment =>
-                    comment.body.includes(commentMarker)
-                );
-
-                if (botComment && botComment.body === commentBody) {
-                    // No changes in the comment, do nothing
-                    return;
-                }
-
-                if (botComment) {
-                    // Update existing comment
-                    await github.rest.issues.updateComment({
-                        owner: owner,
-                        repo: repo,
-                        comment_id: botComment.id,
-                        body: commentBody,
-                    });
-                } else {
-                    // Create new comment
-                    await github.rest.issues.createComment({
-                        owner: owner,
-                        repo: repo,
-                        issue_number: prNumber,
-                        body: commentBody,
-                    });
-                }
-            }
-
-            async function getEsphomeAndComponentChanges(github, owner, repo, prNumber) {
-                const changedFiles = await github.rest.pulls.listFiles({
-                    owner: owner,
-                    repo: repo,
-                    pull_number: prNumber,
-                });
-
-                const esphomeChanges = changedFiles.data
-                    .filter(file => file.filename !== "esphome/core/defines.h" && file.filename.startsWith('esphome/'))
-                    .map(file => {
-                        const match = file.filename.match(/esphome\/([^/]+)/);
-                        return match ? match[1] : null;
-                    })
-                    .filter(it => it !== null);
-
-                if (esphomeChanges.length === 0) {
-                    return {esphomeChanges: [], componentChanges: []};
-                }
-
-                const uniqueEsphomeChanges = [...new Set(esphomeChanges)];
-                const componentChanges = changedFiles.data
-                    .filter(file => file.filename.startsWith('esphome/components/'))
-                    .map(file => {
-                        const match = file.filename.match(/esphome\/components\/([^/]+)\//);
-                        return match ? match[1] : null;
-                    })
-                    .filter(it => it !== null);
-
-                return {esphomeChanges: uniqueEsphomeChanges, componentChanges: [...new Set(componentChanges)]};
-            }
-
-            // Start of main code.
-
-            const prNumber = context.payload.pull_request.number;
-            const {owner, repo} = context.repo;
-
-            const {esphomeChanges, componentChanges} = await getEsphomeAndComponentChanges(github, owner, repo, prNumber);
-            if (componentChanges.length !== 0) {
-                await createComment(github, owner, repo, prNumber, esphomeChanges, componentChanges);
-            }

.github/workflows/issue-codeowner-notify.yml

@@ -1,119 +0,0 @@
-# This workflow automatically notifies codeowners when an issue is labeled with component labels.
-# It reads the CODEOWNERS file to find the maintainers for the labeled components
-# and posts a comment mentioning them to ensure they're aware of the issue.
-
-name: Notify Issue Codeowners
-
-on:
-  issues:
-    types: [labeled]
-
-permissions:
-  issues: write
-  contents: read
-
-jobs:
-  notify-codeowners:
-    name: Run
-    if: ${{ startsWith(github.event.label.name, format('component{0} ', ':')) }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Notify codeowners for component issues
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            const owner = context.repo.owner;
-            const repo = context.repo.repo;
-            const issue_number = context.payload.issue.number;
-            const labelName = context.payload.label.name;
-
-            console.log(`Processing issue #${issue_number} with label: ${labelName}`);
-
-            // Extract component name from label
-            const componentName = labelName.replace('component: ', '');
-            console.log(`Component: ${componentName}`);
-
-            try {
-              // Fetch CODEOWNERS file from root
-              const { data: codeownersFile } = await github.rest.repos.getContent({
-                owner,
-                repo,
-                path: 'CODEOWNERS'
-              });
-              const codeownersContent = Buffer.from(codeownersFile.content, 'base64').toString('utf8');
-
-              // Parse CODEOWNERS file to extract component mappings
-              const codeownersLines = codeownersContent.split('\n')
-                .map(line => line.trim())
-                .filter(line => line && !line.startsWith('#'));
-
-              let componentOwners = null;
-
-              for (const line of codeownersLines) {
-                const parts = line.split(/\s+/);
-                if (parts.length < 2) continue;
-
-                const pattern = parts[0];
-                const owners = parts.slice(1);
-
-                // Look for component patterns: esphome/components/{component}/*
-                const componentMatch = pattern.match(/^esphome\/components\/([^\/]+)\/\*$/);
-                if (componentMatch && componentMatch[1] === componentName) {
-                  componentOwners = owners;
-                  break;
-                }
-              }
-
-              if (!componentOwners) {
-                console.log(`No codeowners found for component: ${componentName}`);
-                return;
-              }
-
-              console.log(`Found codeowners for '${componentName}': ${componentOwners.join(', ')}`);
-
-              // Separate users and teams
-              const userOwners = [];
-              const teamOwners = [];
-
-              for (const owner of componentOwners) {
-                const cleanOwner = owner.startsWith('@') ? owner.slice(1) : owner;
-                if (cleanOwner.includes('/')) {
-                  // Team mention (org/team-name)
-                  teamOwners.push(`@${cleanOwner}`);
-                } else {
-                  // Individual user
-                  userOwners.push(`@${cleanOwner}`);
-                }
-              }
-
-              // Remove issue author from mentions to avoid self-notification
-              const issueAuthor = context.payload.issue.user.login;
-              const filteredUserOwners = userOwners.filter(mention =>
-                mention !== `@${issueAuthor}`
-              );
-
-              const allMentions = [...filteredUserOwners, ...teamOwners];
-
-              if (allMentions.length === 0) {
-                console.log('No codeowners to notify (issue author is the only codeowner)');
-                return;
-              }
-
-              // Create comment body
-              const mentionString = allMentions.join(', ');
-              const commentBody = `👋 Hey ${mentionString}!\n\nThis issue has been labeled with \`component: ${componentName}\` and you've been identified as a codeowner of this component. Please take a look when you have a chance!\n\nThanks for maintaining this component! 🙏`;
-
-              // Post comment
-              await github.rest.issues.createComment({
-                owner,
-                repo,
-                issue_number: issue_number,
-                body: commentBody
-              });
-
-              console.log(`Successfully notified codeowners: ${mentionString}`);
-
-            } catch (error) {
-              console.log('Failed to process codeowner notifications:', error.message);
-              console.error(error);
-            }

.github/workflows/lock.yml

@@ -1,11 +1,29 @@
 ---
-name: Lock closed issues and PRs
+name: Lock
 
+# yamllint disable-line rule:truthy
 on:
   schedule:
-    - cron: "30 0 * * *"  # Run daily at 00:30 UTC
+    - cron: "30 0 * * *"
   workflow_dispatch:
 
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
 jobs:
   lock:
-    uses: esphome/workflows/.github/workflows/lock.yml@main
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v4
+        with:
+          pr-inactive-days: "1"
+          pr-lock-reason: ""
+          exclude-any-pr-labels: keep-open
+
+          issue-inactive-days: "7"
+          issue-lock-reason: ""
+          exclude-any-issue-labels: keep-open

.github/workflows/matchers/lint-python.json

@@ -1,11 +1,11 @@
 {
   "problemMatcher": [
     {
-      "owner": "ruff",
+      "owner": "black",
       "severity": "error",
       "pattern": [
         {
-          "regexp": "^(.*): (Please format this file with the ruff formatter)",
+          "regexp": "^(.*): (Please format this file with the black formatter)",
           "file": 1,
           "message": 2
         }

.github/workflows/needs-docs.yml

@@ -1,24 +0,0 @@
-name: Needs Docs
-
-on:
-  pull_request:
-    types: [labeled, unlabeled]
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for needs-docs label
-        uses: actions/github-script@v7.0.1
-        with:
-          script: |
-            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number
-            });
-            const needsDocs = labels.find(label => label.name === 'needs-docs');
-            if (needsDocs) {
-              core.setFailed('Pull request needs docs');
-            }

.github/workflows/release.yml

@@ -1,6 +1,7 @@
 ---
 name: Publish Release
 
+# yamllint disable-line rule:truthy
 on:
   workflow_dispatch:
   release:
@@ -17,22 +18,14 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
-      branch_build: ${{ steps.tag.outputs.branch_build }}
-      deploy_env: ${{ steps.tag.outputs.deploy_env }}
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3
       - name: Get tag
         id: tag
         # yamllint disable rule:line-length
         run: |
-          if [[ "${{ github.event_name }}" = "release" ]]; then
-            TAG="${{ github.event.release.tag_name}}"
-            BRANCH_BUILD="false"
-            if [[ "${{ github.event.release.prerelease }}" = "true" ]]; then
-              ENVIRONMENT="beta"
-            else
-              ENVIRONMENT="production"
-            fi
+          if [[ "$GITHUB_EVENT_NAME" = "release" ]]; then
+            TAG="${GITHUB_REF#refs/tags/}"
           else
             TAG=$(cat esphome/const.py | sed -n -E "s/^__version__\s+=\s+\"(.+)\"$/\1/p")
             today="$(date --utc '+%Y%m%d')"
@@ -40,155 +33,77 @@ jobs:
             BRANCH=${GITHUB_REF#refs/heads/}
             if [[ "$BRANCH" != "dev" ]]; then
               TAG="${TAG}-${BRANCH}"
-              BRANCH_BUILD="true"
-              ENVIRONMENT=""
-            else
-              BRANCH_BUILD="false"
-              ENVIRONMENT="dev"
             fi
           fi
           echo "tag=${TAG}" >> $GITHUB_OUTPUT
-          echo "branch_build=${BRANCH_BUILD}" >> $GITHUB_OUTPUT
-          echo "deploy_env=${ENVIRONMENT}" >> $GITHUB_OUTPUT
         # yamllint enable rule:line-length
 
   deploy-pypi:
     name: Build and publish to PyPi
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
     steps:
-      - uses: actions/checkout@v4.2.2
+      - uses: actions/checkout@v3
       - name: Set up Python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.x"
+      - name: Set up python environment
+        run: |
+          script/setup
+          pip install setuptools wheel twine
       - name: Build
-        run: |-
-          pip3 install build
-          python3 -m build
-      - name: Publish
-        uses: pypa/gh-action-pypi-publish@v1.12.4
-        with:
-          skip-existing: true
+        run: python setup.py sdist bdist_wheel
+      - name: Upload
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: twine upload dist/*
 
   deploy-docker:
-    name: Build ESPHome ${{ matrix.platform.arch }}
+    name: Build and publish ESPHome ${{ matrix.image.title}}
     if: github.repository == 'esphome/esphome'
     permissions:
       contents: read
       packages: write
-    runs-on: ${{ matrix.platform.os }}
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.image.title == 'lint' }}
     needs: [init]
-    strategy:
-      fail-fast: false
-      matrix:
-        platform:
-          - arch: amd64
-            os: "ubuntu-24.04"
-          - arch: arm64
-            os: "ubuntu-24.04-arm"
-
-    steps:
-      - uses: actions/checkout@v4.2.2
-      - name: Set up Python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: "3.11"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
-
-      - name: Log in to docker hub
-        uses: docker/login-action@v3.4.0
-        with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Log in to the GitHub container registry
-        uses: docker/login-action@v3.4.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build docker
-        uses: ./.github/actions/build-image
-        with:
-          target: final
-          build_type: docker
-          suffix: ""
-          version: ${{ needs.init.outputs.tag }}
-
-      - name: Build ha-addon
-        uses: ./.github/actions/build-image
-        with:
-          target: final
-          build_type: ha-addon
-          suffix: "hassio"
-          version: ${{ needs.init.outputs.tag }}
-
-      # - name: Build lint
-      #   uses: ./.github/actions/build-image
-      #   with:
-      #     target: lint
-      #     build_type: lint
-      #     suffix: lint
-      #     version: ${{ needs.init.outputs.tag }}
-
-      - name: Upload digests
-        uses: actions/upload-artifact@v4.6.2
-        with:
-          name: digests-${{ matrix.platform.arch }}
-          path: /tmp/digests
-          retention-days: 1
-
-  deploy-manifest:
-    name: Publish ESPHome ${{ matrix.image.build_type }} to ${{ matrix.registry }}
-    runs-on: ubuntu-latest
-    needs:
-      - init
-      - deploy-docker
-    if: github.repository == 'esphome/esphome'
-    permissions:
-      contents: read
-      packages: write
     strategy:
       fail-fast: false
       matrix:
         image:
-          - build_type: "docker"
-            suffix: ""
-          - build_type: "ha-addon"
+          - title: "ha-addon"
             suffix: "hassio"
-            # - build_type: "lint"
-            #   suffix: "lint"
-        registry:
-          - ghcr
-          - dockerhub
+            target: "hassio"
+            baseimg: "hassio"
+          - title: "docker"
+            suffix: ""
+            target: "docker"
+            baseimg: "docker"
+          - title: "lint"
+            suffix: "lint"
+            target: "lint"
+            baseimg: "docker"
     steps:
-      - uses: actions/checkout@v4.2.2
-
-      - name: Download digests
-        uses: actions/download-artifact@v4.3.0
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
         with:
-          pattern: digests-*
-          path: /tmp/digests
-          merge-multiple: true
+          python-version: "3.9"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.11.1
+        uses: docker/setup-buildx-action@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
 
       - name: Log in to docker hub
-        if: matrix.registry == 'dockerhub'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
       - name: Log in to the GitHub container registry
-        if: matrix.registry == 'ghcr'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -197,65 +112,40 @@ jobs:
       - name: Generate short tags
         id: tags
         run: |
-          output=$(docker/generate_tags.py \
+          docker/generate_tags.py \
             --tag "${{ needs.init.outputs.tag }}" \
-            --suffix "${{ matrix.image.suffix }}" \
-            --registry "${{ matrix.registry }}")
-          echo $output
-          for l in $output; do
-            echo $l >> $GITHUB_OUTPUT
-          done
+            --suffix "${{ matrix.image.suffix }}"
 
-      - name: Create manifest list and push
-        working-directory: /tmp/digests/${{ matrix.image.build_type }}/${{ matrix.registry }}
-        run: |
-          docker buildx imagetools create $(jq -Rcnr 'inputs | . / "," | map("-t " + .) | join(" ")' <<< "${{ steps.tags.outputs.tags}}") \
-            $(printf '${{ steps.tags.outputs.image }}@sha256:%s ' *)
+      - name: Build and push
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          file: ./docker/Dockerfile
+          platforms: linux/amd64,linux/arm/v7,linux/arm64
+          target: ${{ matrix.image.target }}
+          push: true
+          # yamllint disable rule:line-length
+          cache-from: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }}
+          cache-to: type=registry,ref=ghcr.io/${{ steps.tags.outputs.image }}:cache-${{ steps.tags.outputs.channel }},mode=max
+          # yamllint enable rule:line-length
+          tags: ${{ steps.tags.outputs.tags }}
+          build-args: |
+            BASEIMGTYPE=${{ matrix.image.baseimg }}
+            BUILD_VERSION=${{ needs.init.outputs.tag }}
 
   deploy-ha-addon-repo:
-    if: github.repository == 'esphome/esphome' && needs.init.outputs.branch_build == 'false'
+    if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
-    needs:
-      - init
-      - deploy-manifest
+    needs: [deploy-docker]
     steps:
-      - name: Trigger Workflow
-        uses: actions/github-script@v7.0.1
-        with:
-          github-token: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
-          script: |
-            let description = "ESPHome";
-            if (context.eventName == "release") {
-              description = ${{ toJSON(github.event.release.body) }};
-            }
-            github.rest.actions.createWorkflowDispatch({
-              owner: "esphome",
-              repo: "home-assistant-addon",
-              workflow_id: "bump-version.yml",
-              ref: "main",
-              inputs: {
-                version: "${{ needs.init.outputs.tag }}",
-                content: description
-              }
-            })
-
-  deploy-esphome-schema:
-    if: github.repository == 'esphome/esphome' && needs.init.outputs.branch_build == 'false'
-    runs-on: ubuntu-latest
-    needs: [init]
-    environment: ${{ needs.init.outputs.deploy_env }}
-    steps:
-      - name: Trigger Workflow
-        uses: actions/github-script@v7.0.1
-        with:
-          github-token: ${{ secrets.DEPLOY_ESPHOME_SCHEMA_REPO_TOKEN }}
-          script: |
-            github.rest.actions.createWorkflowDispatch({
-              owner: "esphome",
-              repo: "esphome-schema",
-              workflow_id: "generate-schemas.yml",
-              ref: "main",
-              inputs: {
-                version: "${{ needs.init.outputs.tag }}",
-              }
-            })
+      - env:
+          TOKEN: ${{ secrets.DEPLOY_HA_ADDON_REPO_TOKEN }}
+        # yamllint disable rule:line-length
+        run: |
+          curl \
+            -u ":$TOKEN" \
+            -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            https://api.github.com/repos/esphome/home-assistant-addon/actions/workflows/bump-version.yml/dispatches \
+            -d '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}","content":${{ toJSON(github.event.release.body) }}}}'
+        # yamllint enable rule:line-length

.github/workflows/stale.yml

@@ -1,6 +1,7 @@
 ---
 name: Stale
 
+# yamllint disable-line rule:truthy
 on:
   schedule:
     - cron: "30 0 * * *"
@@ -17,7 +18,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: 90
           days-before-pr-close: 7
@@ -25,7 +26,7 @@ jobs:
           days-before-issue-close: -1
           remove-stale-when-updated: true
           stale-pr-label: "stale"
-          exempt-pr-labels: "not-stale"
+          exempt-pr-labels: "no-stale"
           stale-pr-message: >
             There hasn't been any activity on this pull request recently. This
             pull request has been automatically marked as stale because of that
@@ -37,7 +38,7 @@ jobs:
   close-issues:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9.1.0
+      - uses: actions/stale@v7
         with:
           days-before-pr-stale: -1
           days-before-pr-close: -1

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

@@ -1,48 +0,0 @@
----
-name: Synchronise Device Classes from Home Assistant
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "45 6 * * *"
-
-jobs:
-  sync:
-    name: Sync Device Classes
-    runs-on: ubuntu-latest
-    if: github.repository == 'esphome/esphome'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.2.2
-
-      - name: Checkout Home Assistant
-        uses: actions/checkout@v4.2.2
-        with:
-          repository: home-assistant/core
-          path: lib/home-assistant
-
-      - name: Setup Python
-        uses: actions/setup-python@v5.6.0
-        with:
-          python-version: 3.13
-
-      - name: Install Home Assistant
-        run: |
-          python -m pip install --upgrade pip
-          pip install -e lib/home-assistant
-
-      - name: Sync
-        run: |
-          python ./script/sync-device_class.py
-
-      - name: Commit changes
-        uses: peter-evans/create-pull-request@v7.0.8
-        with:
-          commit-message: "Synchronise Device Classes from Home Assistant"
-          committer: esphomebot <esphome@openhomefoundation.org>
-          author: esphomebot <esphome@openhomefoundation.org>
-          branch: sync/device-classes
-          delete-branch: true
-          title: "Synchronise Device Classes from Home Assistant"
-          body-path: .github/PULL_REQUEST_TEMPLATE.md
-          token: ${{ secrets.DEVICE_CLASS_SYNC_TOKEN }}

.gitignore

@@ -13,12 +13,6 @@ __pycache__/
 # Intellij Idea
 .idea
 
-# Eclipse
-.project
-.cproject
-.pydevproject
-.settings/
-
 # Vim
 *.swp
 
@@ -75,9 +69,6 @@ cov.xml
 # pyenv
 .python-version
 
-# asdf
-.tool-versions
-
 # Environments
 .env
 .venv
@@ -137,10 +128,3 @@ tests/.esphome/
 
 sdkconfig.*
 !sdkconfig.defaults
-
-.tests/
-
-/components
-/managed_components
-
-api-docs/

.pre-commit-config.yaml

@@ -1,67 +1,33 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-
-ci:
-  autoupdate_commit_msg: 'pre-commit: autoupdate'
-  autoupdate_schedule: off  # Disabled until ruff versions are synced between deps and pre-commit
-  # Skip hooks that have issues in pre-commit CI environment
-  skip: [pylint, clang-tidy-hash]
-
 repos:
-  - repo: https://github.com/astral-sh/ruff-pre-commit
-    # Ruff version.
-    rev: v0.12.4
+  - repo: https://github.com/ambv/black
+    rev: 22.12.0
     hooks:
-      # Run the linter.
-      - id: ruff
-        args: [--fix]
-      # Run the formatter.
-      - id: ruff-format
+      - id: black
+        args:
+          - --safe
+          - --quiet
+        files: ^((esphome|script|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.3.0
+    rev: 6.0.0
     hooks:
       - id: flake8
         additional_dependencies:
-          - flake8-docstrings==1.7.0
+          - flake8-docstrings==1.5.0
           - pydocstyle==5.1.1
         files: ^(esphome|tests)/.+\.py$
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v3.4.0
     hooks:
       - id: no-commit-to-branch
         args:
           - --branch=dev
           - --branch=release
           - --branch=beta
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.20.0
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
-        args: [--py311-plus]
-  - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.37.1
-    hooks:
-      - id: yamllint
-        exclude: ^(\.clang-format|\.clang-tidy)$
-  - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v13.0.1
-    hooks:
-      - id: clang-format
-        types_or: [c, c++]
-  - repo: local
-    hooks:
-      - id: pylint
-        name: pylint
-        entry: python3 script/run-in-env.py pylint
-        language: system
-        types: [python]
-      - id: clang-tidy-hash
-        name: Update clang-tidy hash
-        entry: python script/clang_tidy_hash.py --update-if-changed
-        language: python
-        files: ^(\.clang-tidy|platformio\.ini|requirements_dev\.txt)$
-        pass_filenames: false
-        additional_dependencies: []
+        args: [--py39-plus]

.vscode/tasks.json

@@ -2,24 +2,15 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Run Dashboard",
+      "label": "run",
       "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "-m",
-        "esphome",
-        "dashboard",
-        "config/"
-      ],
+      "command": "python3 -m esphome dashboard config/",
       "problemMatcher": []
     },
     {
       "label": "clang-tidy",
       "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "./script/clang-tidy"
-      ],
+      "command": "./script/clang-tidy",
       "problemMatcher": [
         {
           "owner": "clang-tidy",
@@ -36,24 +27,6 @@
           ]
         }
       ]
-    },
-    {
-      "label": "Generate proto files",
-      "type": "shell",
-      "command": "${command:python.interpreterPath}",
-      "args": [
-        "./script/api_protobuf/api_protobuf.py"
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "presentation": {
-        "reveal": "never",
-        "close": true,
-        "panel": "new"
-      },
-      "problemMatcher": []
     }
   ]
 }

.yamllint

@@ -1,19 +1,3 @@
 ---
-extends: default
-
-ignore-from-file: .gitignore
-
-rules:
-  document-start: disable
-  empty-lines:
-    level: error
-    max: 1
-    max-start: 0
-    max-end: 1
-  indentation:
-    level: error
-    spaces: 2
-    indent-sequences: true
-    check-multi-line-strings: false
-  line-length: disable
-  truthy: disable
+ignore: |
+  venv/

CLAUDE.md

@@ -1 +0,0 @@
-.ai/instructions.md

CODEOWNERS

@@ -6,268 +6,128 @@
 # the integration's code owner is automatically notified.
 
 # Core Code
-pyproject.toml @esphome/core
+setup.py @esphome/core
 esphome/*.py @esphome/core
 esphome/core/* @esphome/core
-.github/** @esphome/core
 
 # Integrations
-esphome/components/a01nyub/* @MrSuicideParrot
-esphome/components/a02yyuw/* @TH-Braemer
-esphome/components/absolute_humidity/* @DAVe3283
 esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/adc128s102/* @DeerMaximum
 esphome/components/addressable_light/* @justfalter
-esphome/components/ade7880/* @kpfleming
-esphome/components/ade7953/* @angelnu
-esphome/components/ade7953_i2c/* @angelnu
-esphome/components/ade7953_spi/* @angelnu
-esphome/components/ads1118/* @solomondg1
-esphome/components/ags10/* @mak-42
-esphome/components/aic3204/* @kbx81
 esphome/components/airthings_ble/* @jeromelaban
-esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
-esphome/components/airthings_wave_plus/* @jeromelaban @precurse
-esphome/components/alarm_control_panel/* @grahambrown11 @hwstar
-esphome/components/alpha3/* @jan-hofmeier
-esphome/components/am2315c/* @swoboda1337
+esphome/components/airthings_wave_plus/* @jeromelaban
 esphome/components/am43/* @buxtronix
 esphome/components/am43/cover/* @buxtronix
-esphome/components/am43/sensor/* @buxtronix
 esphome/components/analog_threshold/* @ianchi
 esphome/components/animation/* @syndlex
 esphome/components/anova/* @buxtronix
-esphome/components/apds9306/* @aodrenah
 esphome/components/api/* @OttoWinter
-esphome/components/as5600/* @ammmze
-esphome/components/as5600/sensor/* @ammmze
-esphome/components/as7341/* @mrgnr
 esphome/components/async_tcp/* @OttoWinter
-esphome/components/at581x/* @X-Ryl669
 esphome/components/atc_mithermometer/* @ahpohl
-esphome/components/atm90e26/* @danieltwagner
-esphome/components/atm90e32/* @circuitsetup @descipher
-esphome/components/audio/* @kahrendt
-esphome/components/audio_adc/* @kbx81
-esphome/components/audio_dac/* @kbx81
-esphome/components/axs15231/* @clydebarrow
 esphome/components/b_parasite/* @rbaron
 esphome/components/ballu/* @bazuchan
 esphome/components/bang_bang/* @OttoWinter
 esphome/components/bedjet/* @jhansche
 esphome/components/bedjet/climate/* @jhansche
 esphome/components/bedjet/fan/* @jhansche
-esphome/components/bedjet/sensor/* @javawizard @jhansche
-esphome/components/beken_spi_led_strip/* @Mat931
 esphome/components/bh1750/* @OttoWinter
 esphome/components/binary_sensor/* @esphome/core
-esphome/components/bk72xx/* @kuba2k2
-esphome/components/bl0906/* @athom-tech @jesserockz @tarontop
 esphome/components/bl0939/* @ziceva
 esphome/components/bl0940/* @tobias-
-esphome/components/bl0942/* @dbuezas @dwmw2
-esphome/components/ble_client/* @buxtronix @clydebarrow
+esphome/components/bl0942/* @dbuezas
+esphome/components/ble_client/* @buxtronix
 esphome/components/bluetooth_proxy/* @jesserockz
-esphome/components/bme280_base/* @esphome/core
-esphome/components/bme280_spi/* @apbodrov
 esphome/components/bme680_bsec/* @trvrnrth
-esphome/components/bme68x_bsec2/* @kbx81 @neffs
-esphome/components/bme68x_bsec2_i2c/* @kbx81 @neffs
-esphome/components/bmi160/* @flaviut
-esphome/components/bmp280_base/* @ademuri
-esphome/components/bmp280_i2c/* @ademuri
-esphome/components/bmp280_spi/* @ademuri
-esphome/components/bmp3xx/* @latonita
-esphome/components/bmp3xx_base/* @latonita @martgras
-esphome/components/bmp3xx_i2c/* @latonita
-esphome/components/bmp3xx_spi/* @latonita
-esphome/components/bmp581/* @kahrendt
+esphome/components/bmp3xx/* @martgras
 esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
-esphome/components/bytebuffer/* @clydebarrow
-esphome/components/camera/* @DT-art1 @bdraco
 esphome/components/canbus/* @danielschramm @mvturnho
-esphome/components/cap1188/* @mreditor97
+esphome/components/cap1188/* @MrEditor97
 esphome/components/captive_portal/* @OttoWinter
 esphome/components/ccs811/* @habbie
 esphome/components/cd74hc4067/* @asoehlke
-esphome/components/ch422g/* @clydebarrow @jesterret
-esphome/components/chsc6x/* @kkosik20
 esphome/components/climate/* @esphome/core
 esphome/components/climate_ir/* @glmnet
-esphome/components/cm1106/* @andrewjswan
 esphome/components/color_temperature/* @jesserockz
-esphome/components/combination/* @Cat-Ion @kahrendt
-esphome/components/const/* @esphome/core
 esphome/components/coolix/* @glmnet
 esphome/components/copy/* @OttoWinter
 esphome/components/cover/* @esphome/core
 esphome/components/cs5460a/* @balrog-kun
 esphome/components/cse7761/* @berfenger
-esphome/components/cst226/* @clydebarrow
-esphome/components/cst816/* @clydebarrow
 esphome/components/ct_clamp/* @jesserockz
 esphome/components/current_based/* @djwmarcx
 esphome/components/dac7678/* @NickB1
-esphome/components/daikin_arc/* @MagicBear
 esphome/components/daikin_brc/* @hagak
-esphome/components/dallas_temp/* @ssieb
 esphome/components/daly_bms/* @s1lvi0
 esphome/components/dashboard_import/* @esphome/core
-esphome/components/datetime/* @jesserockz @rfdarter
 esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
-esphome/components/dfrobot_sen0395/* @niklasweber
 esphome/components/dht/* @OttoWinter
 esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
 esphome/components/ds1307/* @badbadc0ffee
-esphome/components/ds2484/* @mrk-its
 esphome/components/dsmr/* @glmnet @zuidwijk
-esphome/components/duty_time/* @dudanov
 esphome/components/ee895/* @Stock-M
-esphome/components/ektf2232/touchscreen/* @jesserockz
-esphome/components/emc2101/* @ellull
-esphome/components/emmeti/* @E440QF
-esphome/components/ens160/* @latonita
-esphome/components/ens160_base/* @latonita @vincentscode
-esphome/components/ens160_i2c/* @latonita
-esphome/components/ens160_spi/* @latonita
+esphome/components/ektf2232/* @jesserockz
 esphome/components/ens210/* @itn3rd77
-esphome/components/es7210/* @kahrendt
-esphome/components/es7243e/* @kbx81
-esphome/components/es8156/* @kbx81
-esphome/components/es8311/* @kahrendt @kroimon
-esphome/components/es8388/* @P4uLT
 esphome/components/esp32/* @esphome/core
-esphome/components/esp32_ble/* @Rapsssito @jesserockz
+esphome/components/esp32_ble/* @jesserockz
 esphome/components/esp32_ble_client/* @jesserockz
-esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
+esphome/components/esp32_ble_server/* @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
-esphome/components/esp32_hosted/* @swoboda1337
 esphome/components/esp32_improv/* @jesserockz
-esphome/components/esp32_rmt/* @jesserockz
-esphome/components/esp32_rmt_led_strip/* @jesserockz
 esphome/components/esp8266/* @esphome/core
-esphome/components/esp_ldo/* @clydebarrow
 esphome/components/ethernet_info/* @gtjadsonsantos
-esphome/components/event/* @nohat
-esphome/components/event_emitter/* @Rapsssito
 esphome/components/exposure_notifications/* @OttoWinter
 esphome/components/ezo/* @ssieb
 esphome/components/ezo_pmp/* @carlos-sarmiento
 esphome/components/factory_reset/* @anatoly-savchenkov
 esphome/components/fastled_base/* @OttoWinter
 esphome/components/feedback/* @ianchi
-esphome/components/fingerprint_grow/* @OnFreund @alexborro @loongyh
-esphome/components/font/* @clydebarrow @esphome/core
-esphome/components/fs3000/* @kahrendt
-esphome/components/ft5x06/* @clydebarrow
-esphome/components/ft63x6/* @gpambrozio
-esphome/components/gcja5/* @gcormier
-esphome/components/gdk101/* @Szewcson
-esphome/components/gl_r01_i2c/* @pkejval
+esphome/components/fingerprint_grow/* @OnFreund @loongyh
 esphome/components/globals/* @esphome/core
-esphome/components/gp2y1010au0f/* @zry98
-esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
-esphome/components/gpio/one_wire/* @ssieb
-esphome/components/gps/* @coogle @ximex
+esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
-esphome/components/graphical_display_menu/* @MrMDavidson
-esphome/components/gree/* @orestismers
-esphome/components/grove_gas_mc_v2/* @YorkshireIoT
-esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
-esphome/components/gt911/* @clydebarrow @jesserockz
-esphome/components/haier/* @paveldn
-esphome/components/haier/binary_sensor/* @paveldn
-esphome/components/haier/button/* @paveldn
-esphome/components/haier/sensor/* @paveldn
-esphome/components/haier/switch/* @paveldn
-esphome/components/haier/text_sensor/* @paveldn
 esphome/components/havells_solar/* @sourabhjaiswal
 esphome/components/hbridge/fan/* @WeekendWarrior
 esphome/components/hbridge/light/* @DotNetDann
-esphome/components/hbridge/switch/* @dwmw2
-esphome/components/he60r/* @clydebarrow
 esphome/components/heatpumpir/* @rob-deutsch
 esphome/components/hitachi_ac424/* @sourabhjaiswal
-esphome/components/hm3301/* @freekode
-esphome/components/hmac_md5/* @dwmw2
-esphome/components/homeassistant/* @OttoWinter @esphome/core
-esphome/components/homeassistant/number/* @landonr
-esphome/components/homeassistant/switch/* @Links2004
-esphome/components/honeywell_hih_i2c/* @Benichou34
+esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
-esphome/components/honeywellabp2_i2c/* @jpfaff
-esphome/components/host/* @clydebarrow @esphome/core
-esphome/components/host/time/* @clydebarrow
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/hte501/* @Stock-M
-esphome/components/http_request/ota/* @oarcher
-esphome/components/http_request/update/* @jesserockz
-esphome/components/htu31d/* @betterengineering
 esphome/components/hydreon_rgxx/* @functionpointer
-esphome/components/hyt271/* @Philippe12
 esphome/components/i2c/* @esphome/core
-esphome/components/i2c_device/* @gabest11
 esphome/components/i2s_audio/* @jesserockz
-esphome/components/i2s_audio/media_player/* @jesserockz
-esphome/components/i2s_audio/microphone/* @jesserockz
-esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
-esphome/components/iaqcore/* @yozik04
-esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
-esphome/components/ina226/* @Sergio303 @latonita
-esphome/components/ina260/* @mreditor97
-esphome/components/ina2xx_base/* @latonita
-esphome/components/ina2xx_i2c/* @latonita
-esphome/components/ina2xx_spi/* @latonita
+esphome/components/ina260/* @MrEditor97
 esphome/components/inkbird_ibsth1_mini/* @fkirill
 esphome/components/inkplate6/* @jesserockz
 esphome/components/integration/* @OttoWinter
-esphome/components/internal_temperature/* @Mat931
 esphome/components/interval/* @esphome/core
-esphome/components/jsn_sr04t/* @Mafus1
 esphome/components/json/* @OttoWinter
-esphome/components/kamstrup_kmp/* @cfeenstra1024
+esphome/components/kalman_combinator/* @Cat-Ion
 esphome/components/key_collector/* @ssieb
 esphome/components/key_provider/* @ssieb
-esphome/components/kuntze/* @ssieb
-esphome/components/lc709203f/* @ilikecake
 esphome/components/lcd_menu/* @numo68
-esphome/components/ld2410/* @regevbr @sebcaps
-esphome/components/ld2420/* @descipher
-esphome/components/ld2450/* @hareeshmu
 esphome/components/ledc/* @OttoWinter
-esphome/components/libretiny/* @kuba2k2
-esphome/components/libretiny_pwm/* @kuba2k2
 esphome/components/light/* @esphome/core
-esphome/components/lightwaverf/* @max246
 esphome/components/lilygo_t5_47/touchscreen/* @jesserockz
-esphome/components/ln882x/* @lamauny
 esphome/components/lock/* @esphome/core
 esphome/components/logger/* @esphome/core
-esphome/components/logger/select/* @clydebarrow
-esphome/components/lps22/* @nagisa
-esphome/components/ltr390/* @latonita @sjtrny
-esphome/components/ltr501/* @latonita
-esphome/components/ltr_als_ps/* @latonita
-esphome/components/lvgl/* @clydebarrow
-esphome/components/m5stack_8angle/* @rnauber
-esphome/components/mapping/* @clydebarrow
+esphome/components/ltr390/* @sjtrny
 esphome/components/matrix_keypad/* @ssieb
-esphome/components/max17043/* @blacknell
 esphome/components/max31865/* @DAVe3283
 esphome/components/max44009/* @berfenger
-esphome/components/max6956/* @looping40
 esphome/components/max7219digit/* @rspaargaren
 esphome/components/max9611/* @mckaymatthew
 esphome/components/mcp23008/* @jesserockz
@@ -279,27 +139,18 @@ esphome/components/mcp23x17_base/* @jesserockz
 esphome/components/mcp23xxx_base/* @jesserockz
 esphome/components/mcp2515/* @danielschramm @mvturnho
 esphome/components/mcp3204/* @rsumner
-esphome/components/mcp4461/* @p1ngb4ck
 esphome/components/mcp4728/* @berfenger
 esphome/components/mcp47a1/* @jesserockz
-esphome/components/mcp9600/* @mreditor97
+esphome/components/mcp9600/* @MrEditor97
 esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
-esphome/components/micro_wake_word/* @jesserockz @kahrendt
-esphome/components/micronova/* @jorre05
-esphome/components/microphone/* @jesserockz @kahrendt
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
 esphome/components/midea_ir/* @dudanov
-esphome/components/mipi_spi/* @clydebarrow
 esphome/components/mitsubishi/* @RubyBailey
-esphome/components/mixer/speaker/* @kahrendt
 esphome/components/mlx90393/* @functionpointer
-esphome/components/mlx90614/* @jesserockz
-esphome/components/mmc5603/* @benhoff
-esphome/components/mmc5983/* @agoode
 esphome/components/modbus_controller/* @martgras
 esphome/components/modbus_controller/binary_sensor/* @martgras
 esphome/components/modbus_controller/number/* @martgras
@@ -308,106 +159,66 @@ esphome/components/modbus_controller/select/* @martgras @stegm
 esphome/components/modbus_controller/sensor/* @martgras
 esphome/components/modbus_controller/switch/* @martgras
 esphome/components/modbus_controller/text_sensor/* @martgras
-esphome/components/mopeka_ble/* @Fabian-Schmidt @spbrogan
+esphome/components/mopeka_ble/* @spbrogan
 esphome/components/mopeka_pro_check/* @spbrogan
-esphome/components/mopeka_std_check/* @Fabian-Schmidt
 esphome/components/mpl3115a2/* @kbickar
 esphome/components/mpu6886/* @fabaff
-esphome/components/ms8607/* @e28eta
-esphome/components/msa3xx/* @latonita
-esphome/components/nau7802/* @cujomalainey
 esphome/components/network/* @esphome/core
-esphome/components/nextion/* @edwardtfn @senexcrenshaw
+esphome/components/nextion/* @senexcrenshaw
 esphome/components/nextion/binary_sensor/* @senexcrenshaw
 esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
-esphome/components/nfc/* @jesserockz @kbx81
-esphome/components/noblex/* @AGalfra
-esphome/components/npi19/* @bakerkj
-esphome/components/nrf52/* @tomaszduda23
+esphome/components/nfc/* @jesserockz
 esphome/components/number/* @esphome/core
-esphome/components/one_wire/* @ssieb
-esphome/components/online_image/* @clydebarrow @guillempages
-esphome/components/opentherm/* @olegtarasov
-esphome/components/openthread/* @mrene
-esphome/components/opt3001/* @ccutrer
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
-esphome/components/packet_transport/* @clydebarrow
-esphome/components/pca6416a/* @Mat931
-esphome/components/pca9554/* @clydebarrow @hwstar
+esphome/components/pca9554/* @hwstar
 esphome/components/pcf85063/* @brogon
-esphome/components/pcf8563/* @KoenBreeman
-esphome/components/pi4ioe5v6408/* @jesserockz
 esphome/components/pid/* @OttoWinter
 esphome/components/pipsolar/* @andreashergert1984
 esphome/components/pm1006/* @habbie
-esphome/components/pm2005/* @andrewjswan
 esphome/components/pmsa003i/* @sjtrny
-esphome/components/pmsx003/* @ximex
-esphome/components/pmwcs3/* @SeByDocKy
 esphome/components/pn532/* @OttoWinter @jesserockz
 esphome/components/pn532_i2c/* @OttoWinter @jesserockz
 esphome/components/pn532_spi/* @OttoWinter @jesserockz
-esphome/components/pn7150/* @jesserockz @kbx81
-esphome/components/pn7150_i2c/* @jesserockz @kbx81
-esphome/components/pn7160/* @jesserockz @kbx81
-esphome/components/pn7160_i2c/* @jesserockz @kbx81
-esphome/components/pn7160_spi/* @jesserockz @kbx81
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @TrentHouliston @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @cstaahl @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
-esphome/components/pylontech/* @functionpointer
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
-esphome/components/qspi_dbi/* @clydebarrow
-esphome/components/qwiic_pir/* @kahrendt
 esphome/components/radon_eye_ble/* @jeffeb3
 esphome/components/radon_eye_rd200/* @jeffeb3
 esphome/components/rc522/* @glmnet
 esphome/components/rc522_i2c/* @glmnet
 esphome/components/rc522_spi/* @glmnet
-esphome/components/resampler/speaker/* @kahrendt
 esphome/components/restart/* @esphome/core
 esphome/components/rf_bridge/* @jesserockz
 esphome/components/rgbct/* @jesserockz
 esphome/components/rp2040/* @jesserockz
-esphome/components/rp2040_pio_led_strip/* @Papa-DMan
 esphome/components/rp2040_pwm/* @jesserockz
-esphome/components/rpi_dpi_rgb/* @clydebarrow
-esphome/components/rtl87xx/* @kuba2k2
 esphome/components/rtttl/* @glmnet
-esphome/components/runtime_stats/* @bdraco
-esphome/components/safe_mode/* @jsuanet @kbx81 @paulmonigatti
+esphome/components/safe_mode/* @jsuanet @paulmonigatti
 esphome/components/scd4x/* @martgras @sjtrny
 esphome/components/script/* @esphome/core
-esphome/components/sdl/* @bdm310 @clydebarrow
 esphome/components/sdm_meter/* @jesserockz @polyfaces
 esphome/components/sdp3x/* @Azimath
-esphome/components/seeed_mr24hpc1/* @limengdu
-esphome/components/seeed_mr60bha2/* @limengdu
-esphome/components/seeed_mr60fda2/* @limengdu
 esphome/components/selec_meter/* @sourabhjaiswal
 esphome/components/select/* @esphome/core
-esphome/components/sen0321/* @notjj
-esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
-esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
-esphome/components/sht3xd/* @mrtoy-me
 esphome/components/sht4x/* @sjtrny
 esphome/components/shutdown/* @esphome/core @jsuanet
 esphome/components/sigma_delta_output/* @Cat-Ion
 esphome/components/sim800l/* @glmnet
 esphome/components/sm10bit_base/* @Cossid
-esphome/components/sm2135/* @BoukeHaarsma23 @dd32 @matika77
+esphome/components/sm2135/* @BoukeHaarsma23
 esphome/components/sm2235/* @Cossid
 esphome/components/sm2335/* @Cossid
 esphome/components/sml/* @alengwenus
@@ -415,12 +226,7 @@ esphome/components/smt100/* @piechade
 esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
-esphome/components/sound_level/* @kahrendt
-esphome/components/speaker/* @jesserockz @kahrendt
-esphome/components/speaker/media_player/* @kahrendt @synesthesiam
-esphome/components/spi/* @clydebarrow @esphome/core
-esphome/components/spi_device/* @clydebarrow
-esphome/components/spi_led_strip/* @clydebarrow
+esphome/components/spi/* @esphome/core
 esphome/components/sprinkler/* @kbx81
 esphome/components/sps30/* @martgras
 esphome/components/ssd1322_base/* @kbx81
@@ -434,52 +240,29 @@ esphome/components/ssd1331_base/* @kbx81
 esphome/components/ssd1331_spi/* @kbx81
 esphome/components/ssd1351_base/* @kbx81
 esphome/components/ssd1351_spi/* @kbx81
-esphome/components/st7567_base/* @latonita
-esphome/components/st7567_i2c/* @latonita
-esphome/components/st7567_spi/* @latonita
-esphome/components/st7701s/* @clydebarrow
 esphome/components/st7735/* @SenexCrenshaw
 esphome/components/st7789v/* @kbx81
 esphome/components/st7920/* @marsjan155
-esphome/components/statsd/* @Links2004
 esphome/components/substitutions/* @esphome/core
 esphome/components/sun/* @OttoWinter
-esphome/components/sun_gtil2/* @Mat931
 esphome/components/switch/* @esphome/core
-esphome/components/switch/binary_sensor/* @ssieb
-esphome/components/sx126x/* @swoboda1337
-esphome/components/sx127x/* @swoboda1337
-esphome/components/syslog/* @clydebarrow
 esphome/components/t6615/* @tylermenezes
-esphome/components/tc74/* @sethgirvan
 esphome/components/tca9548a/* @andreashergert1984
-esphome/components/tca9555/* @mobrembski
 esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
-esphome/components/tem3200/* @bakerkj
-esphome/components/template/alarm_control_panel/* @grahambrown11 @hwstar
-esphome/components/template/datetime/* @rfdarter
-esphome/components/template/event/* @nohat
-esphome/components/template/fan/* @ssieb
-esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
-esphome/components/tlc5971/* @IJIJI
 esphome/components/tm1621/* @Philippe12
 esphome/components/tm1637/* @glmnet
 esphome/components/tm1638/* @skykingjwc
-esphome/components/tm1651/* @freekode
 esphome/components/tmp102/* @timsavage
-esphome/components/tmp1075/* @sybrenstuvel
 esphome/components/tmp117/* @Azimath
 esphome/components/tof10120/* @wstrzalka
-esphome/components/tormatic/* @ti-mo
 esphome/components/toshiba/* @kbx81
-esphome/components/touchscreen/* @jesserockz @nielsnl68
+esphome/components/touchscreen/* @jesserockz
 esphome/components/tsl2591/* @wjcarpenter
-esphome/components/tt21100/* @kroimon
 esphome/components/tuya/binary_sensor/* @jesserockz
 esphome/components/tuya/climate/* @jesserockz
 esphome/components/tuya/number/* @frankiboy1
@@ -488,56 +271,19 @@ esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
-esphome/components/uart/button/* @ssieb
-esphome/components/uart/packet_transport/* @clydebarrow
-esphome/components/udp/* @clydebarrow
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
-esphome/components/update/* @jesserockz
-esphome/components/uponor_smatrix/* @kroimon
-esphome/components/usb_host/* @clydebarrow
-esphome/components/usb_uart/* @clydebarrow
-esphome/components/valve/* @esphome/core
-esphome/components/vbus/* @ssieb
-esphome/components/veml3235/* @kbx81
-esphome/components/veml7700/* @latonita
 esphome/components/version/* @esphome/core
-esphome/components/voice_assistant/* @jesserockz @kahrendt
-esphome/components/wake_on_lan/* @clydebarrow @willwill2will54
-esphome/components/watchdog/* @oarcher
-esphome/components/waveshare_epaper/* @clydebarrow
-esphome/components/web_server/ota/* @esphome/core
+esphome/components/wake_on_lan/* @willwill2will54
 esphome/components/web_server_base/* @OttoWinter
-esphome/components/web_server_idf/* @dentra
-esphome/components/weikai/* @DrCoolZic
-esphome/components/weikai_i2c/* @DrCoolZic
-esphome/components/weikai_spi/* @DrCoolZic
 esphome/components/whirlpool/* @glmnet
 esphome/components/whynter/* @aeonsablaze
 esphome/components/wiegand/* @ssieb
-esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
-esphome/components/wk2132_i2c/* @DrCoolZic
-esphome/components/wk2132_spi/* @DrCoolZic
-esphome/components/wk2168_i2c/* @DrCoolZic
-esphome/components/wk2168_spi/* @DrCoolZic
-esphome/components/wk2204_i2c/* @DrCoolZic
-esphome/components/wk2204_spi/* @DrCoolZic
-esphome/components/wk2212_i2c/* @DrCoolZic
-esphome/components/wk2212_spi/* @DrCoolZic
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
-esphome/components/xgzp68xx/* @gcormier
-esphome/components/xiaomi_hhccjcy10/* @fariouche
-esphome/components/xiaomi_lywsd02mmc/* @juanluss31
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
-esphome/components/xiaomi_xmwsdj04mmc/* @medusalix
-esphome/components/xl9535/* @mreditor97
-esphome/components/xpt2046/touchscreen/* @nielsnl68 @numo68
-esphome/components/xxtea/* @clydebarrow
-esphome/components/zephyr/* @tomaszduda23
-esphome/components/zhlt01/* @cfeenstra1024
-esphome/components/zio_ultrasonic/* @kahrendt
+esphome/components/xpt2046/* @nielsnl68 @numo68

CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@openhomefoundation.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at esphome@nabucasa.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

CONTRIBUTING.md

@@ -1,14 +1,14 @@
-# Contributing to ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
+# Contributing to ESPHome
 
-We welcome contributions to the ESPHome suite of code and documentation!
+For a detailed guide, please see https://esphome.io/guides/contributing.html#contributing-to-esphome
 
-Please read our [contributing guide](https://esphome.io/guides/contributing.html) if you wish to contribute to the
-project and be sure to join us on [Discord](https://discord.gg/KhAMKrd).
+Things to note when contributing:
 
-**See also:**
-
-[Documentation](https://esphome.io) -- [Issues](https://github.com/esphome/esphome/issues) -- [Feature requests](https://github.com/orgs/esphome/discussions)
-
----
-
-[![ESPHome - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/esphome.png)](https://www.openhomefoundation.org/)
+ - Please test your changes :)
+ - If a new feature is added or an existing user-facing feature is changed, you should also
+   update the [docs](https://github.com/esphome/esphome-docs). See [contributing to esphome-docs](https://esphome.io/guides/contributing.html#contributing-to-esphomedocs)
+   for more information.
+ - Please also update the tests in the `tests/` folder. You can do so by just adding a line in one of the YAML files
+   which checks if your new feature compiles correctly.
+ - Sometimes I will let pull requests linger because I'm not 100% sure about them. Please feel free to ping
+   me after some time.

GEMINI.md

@@ -1 +0,0 @@
-.ai/instructions.md

MANIFEST.in

@@ -1,6 +1,8 @@
 include LICENSE
 include README.md
 include requirements.txt
-recursive-include esphome *.cpp *.h *.tcc *.c
+include esphome/dashboard/templates/*.html
+recursive-include esphome/dashboard/static *.ico *.js *.css *.woff* LICENSE
+recursive-include esphome *.cpp *.h *.tcc
 recursive-include esphome *.py.script
 recursive-include esphome LICENSE.txt

README.md

@@ -1,16 +1,9 @@
 # ESPHome [![Discord Chat](https://img.shields.io/discord/429907082951524364.svg)](https://discord.gg/KhAMKrd) [![GitHub release](https://img.shields.io/github/release/esphome/esphome.svg)](https://GitHub.com/esphome/esphome/releases/)
 
-<a href="https://esphome.io/">
-  <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://esphome.io/_static/logo-text-on-dark.svg", alt="ESPHome Logo">
-    <img src="https://esphome.io/_static/logo-text-on-light.svg" alt="ESPHome Logo">
-  </picture>
-</a>
+[![ESPHome Logo](https://esphome.io/_images/logo-text.png)](https://esphome.io/)
 
----
+**Documentation:** https://esphome.io/
 
-[Documentation](https://esphome.io) -- [Issues](https://github.com/esphome/esphome/issues) -- [Feature requests](https://github.com/orgs/esphome/discussions)
+For issues, please go to [the issue tracker](https://github.com/esphome/issues/issues).
 
----
-
-[![ESPHome - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/esphome.png)](https://www.openhomefoundation.org/)
+For feature requests, please see [feature requests](https://github.com/esphome/feature-requests/issues).

docker/Dockerfile

@@ -1,57 +1,83 @@
-ARG BUILD_VERSION=dev
-ARG BUILD_OS=alpine
-ARG BUILD_BASE_VERSION=2025.04.0
-ARG BUILD_TYPE=docker
+# Build these with the build.py script
+# Example:
+#   python3 docker/build.py --tag dev --arch amd64 --build-type docker build
 
-FROM ghcr.io/esphome/docker-base:${BUILD_OS}-${BUILD_BASE_VERSION} AS base-source-docker
-FROM ghcr.io/esphome/docker-base:${BUILD_OS}-ha-addon-${BUILD_BASE_VERSION} AS base-source-ha-addon
+# One of "docker", "hassio"
+ARG BASEIMGTYPE=docker
 
-ARG BUILD_TYPE
-FROM base-source-${BUILD_TYPE} AS base
+# https://github.com/hassio-addons/addon-debian-base/releases
+FROM ghcr.io/hassio-addons/debian-base:6.2.0 AS base-hassio
+# https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
+FROM debian:bullseye-20221024-slim AS base-docker
 
-RUN git config --system --add safe.directory "*"
+FROM base-${BASEIMGTYPE} AS base
 
-ENV PIP_DISABLE_PIP_VERSION_CHECK=1
-
-RUN pip install --no-cache-dir -U pip uv==0.6.14
-
-COPY requirements.txt /
+ARG TARGETARCH
+ARG TARGETVARIANT
 
 RUN \
-    uv pip install --no-cache-dir \
-    -r /requirements.txt
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
+    && apt-get install -y --no-install-recommends \
+        python3=3.9.2-3 \
+        python3-pip=20.3.4-4+deb11u1 \
+        python3-setuptools=52.0.0-4 \
+        python3-pil=8.1.2+dfsg-0.3+deb11u1 \
+        python3-cryptography=3.3.2-1 \
+        iputils-ping=3:20210202-1 \
+        git=1:2.30.2-1 \
+        curl=7.74.0-1.3+deb11u3 \
+        openssh-client=1:8.4p1-5+deb11u1 \
+    && rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
+
+ENV \
+  # Fix click python3 lang warning https://click.palletsprojects.com/en/7.x/python3/
+  LANG=C.UTF-8 LC_ALL=C.UTF-8 \
+  # Store globally installed pio libs in /piolibs
+  PLATFORMIO_GLOBALLIB_DIR=/piolibs
+
+# Support legacy binaries on Debian multiarch system. There is no "correct" way
+# to do this, other than using properly built toolchains...
+# See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
+RUN \
+    if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+        ln -s /lib/arm-linux-gnueabihf/ld-linux.so.3 /lib/ld-linux.so.3; \
+    fi
 
 RUN \
-    platformio settings set enable_telemetry No \
+    # Ubuntu python3-pip is missing wheel
+    pip3 install --no-cache-dir \
+        wheel==0.37.1 \
+        platformio==6.1.5 \
+    # Change some platformio settings
+    && platformio settings set enable_telemetry No \
     && platformio settings set check_platformio_interval 1000000 \
     && mkdir -p /piolibs
 
-COPY script/platformio_install_deps.py platformio.ini /
-RUN /platformio_install_deps.py /platformio.ini --libraries
 
-ARG BUILD_VERSION
-
-LABEL \
-    org.opencontainers.image.authors="The ESPHome Authors" \
-    org.opencontainers.image.title="ESPHome" \
-    org.opencontainers.image.description="ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems" \
-    org.opencontainers.image.url="https://esphome.io/" \
-    org.opencontainers.image.documentation="https://esphome.io/" \
-    org.opencontainers.image.source="https://github.com/esphome/esphome" \
-    org.opencontainers.image.licenses="ESPHome" \
-    org.opencontainers.image.version=${BUILD_VERSION}
+# First install requirements to leverage caching when requirements don't change
+COPY requirements.txt requirements_optional.txt docker/platformio_install_deps.py platformio.ini /
+RUN \
+    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+    && /platformio_install_deps.py /platformio.ini
 
 
 # ======================= docker-type image =======================
-FROM base AS base-docker
+FROM base AS docker
+
+# Copy esphome and install
+COPY . /esphome
+RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+
+# Settings for dashboard
+ENV USERNAME="" PASSWORD=""
 
 # Expose the dashboard to Docker
 EXPOSE 6052
 
-# Run healthcheck (heartbeat)
-HEALTHCHECK --interval=30s --timeout=30s \
-    CMD curl --fail http://localhost:6052/version -A "HealthCheck" || exit 1
-
 COPY docker/docker_entrypoint.sh /entrypoint.sh
 
 # The directory the user should mount their configuration files to
@@ -64,23 +90,65 @@ ENTRYPOINT ["/entrypoint.sh"]
 CMD ["dashboard", "/config"]
 
 
-# ======================= ha-addon-type image =======================
-FROM base AS base-ha-addon
+
+
+# ======================= hassio-type image =======================
+FROM base AS hassio
+
+RUN \
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
+    && apt-get install -y --no-install-recommends \
+        nginx-light=1.18.0-6.1+deb11u3 \
+    && rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
+
+ARG BUILD_VERSION=dev
 
 # Copy root filesystem
 COPY docker/ha-addon-rootfs/ /
 
-ARG BUILD_VERSION
+# Copy esphome and install
+COPY . /esphome
+RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+
+# Labels
 LABEL \
     io.hass.name="ESPHome" \
-    io.hass.description="ESPHome is a system to configure your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems" \
+    io.hass.description="Manage and program ESP8266/ESP32 microcontrollers through YAML configuration files" \
     io.hass.type="addon" \
     io.hass.version="${BUILD_VERSION}"
     # io.hass.arch is inherited from addon-debian-base
 
-ARG BUILD_TYPE
-FROM base-${BUILD_TYPE} AS final
 
-# Copy esphome and install
-COPY . /esphome
-RUN uv pip install --no-cache-dir -e /esphome
+
+
+# ======================= lint-type image =======================
+FROM base AS lint
+
+ENV \
+  PLATFORMIO_CORE_DIR=/esphome/.temp/platformio
+
+RUN \
+    apt-get update \
+    # Use pinned versions so that we get updates with build caching
+    && apt-get install -y --no-install-recommends \
+        clang-format-11=1:11.0.1-2 \
+        clang-tidy-11=1:11.0.1-2 \
+        patch=2.7.6-7 \
+        software-properties-common=0.96.20.2-2.1 \
+        nano=5.4-2+deb11u2 \
+        build-essential=12.9 \
+        python3-dev=3.9.2-3 \
+    && rm -rf \
+        /tmp/* \
+        /var/{cache,log}/* \
+        /var/lib/apt/lists/*
+
+COPY requirements_test.txt /
+RUN pip3 install --no-cache-dir -r /requirements_test.txt
+
+VOLUME ["/esphome"]
+WORKDIR /esphome

docker/build.py

@@ -1,19 +1,22 @@
 #!/usr/bin/env python3
-import argparse
 from dataclasses import dataclass
-import re
-import shlex
 import subprocess
+import argparse
+from platform import machine
+import shlex
+import re
 import sys
 
+
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
 CHANNEL_RELEASE = "release"
 CHANNELS = [CHANNEL_DEV, CHANNEL_BETA, CHANNEL_RELEASE]
 
 ARCH_AMD64 = "amd64"
+ARCH_ARMV7 = "armv7"
 ARCH_AARCH64 = "aarch64"
-ARCHS = [ARCH_AMD64, ARCH_AARCH64]
+ARCHS = [ARCH_AMD64, ARCH_ARMV7, ARCH_AARCH64]
 
 TYPE_DOCKER = "docker"
 TYPE_HA_ADDON = "ha-addon"
@@ -54,7 +57,7 @@ manifest_parser = subparsers.add_parser(
 class DockerParams:
     build_to: str
     manifest_to: str
-    build_type: str
+    baseimgtype: str
     platform: str
     target: str
 
@@ -66,19 +69,25 @@ class DockerParams:
             TYPE_LINT: "esphome/esphome-lint",
         }[build_type]
         build_to = f"{prefix}-{arch}"
+        baseimgtype = {
+            TYPE_DOCKER: "docker",
+            TYPE_HA_ADDON: "hassio",
+            TYPE_LINT: "docker",
+        }[build_type]
         platform = {
             ARCH_AMD64: "linux/amd64",
+            ARCH_ARMV7: "linux/arm/v7",
             ARCH_AARCH64: "linux/arm64",
         }[arch]
         target = {
-            TYPE_DOCKER: "final",
-            TYPE_HA_ADDON: "final",
+            TYPE_DOCKER: "docker",
+            TYPE_HA_ADDON: "hassio",
             TYPE_LINT: "lint",
         }[build_type]
         return cls(
             build_to=build_to,
             manifest_to=prefix,
-            build_type=build_type,
+            baseimgtype=baseimgtype,
             platform=platform,
             target=target,
         )
@@ -140,7 +149,7 @@ def main():
             "buildx",
             "build",
             "--build-arg",
-            f"BUILD_TYPE={params.build_type}",
+            f"BASEIMGTYPE={params.baseimgtype}",
             "--build-arg",
             f"BUILD_VERSION={args.tag}",
             "--cache-from",

docker/docker_entrypoint.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # If /cache is mounted, use that as PIO's coredir
 # otherwise use path in /config (so that PIO packages aren't downloaded on each compile)
@@ -21,10 +21,4 @@ export PLATFORMIO_PLATFORMS_DIR="${pio_cache_base}/platforms"
 export PLATFORMIO_PACKAGES_DIR="${pio_cache_base}/packages"
 export PLATFORMIO_CACHE_DIR="${pio_cache_base}/cache"
 
-# If /build is mounted, use that as the build path
-# otherwise use path in /config (so that builds aren't lost on container restart)
-if [[ -d /build ]]; then
-    export ESPHOME_BUILD_PATH=/build
-fi
-
 exec esphome "$@"

docker/generate_tags.py

@@ -1,14 +1,13 @@
 #!/usr/bin/env python3
-import argparse
 import re
+import os
+import argparse
+import json
 
 CHANNEL_DEV = "dev"
 CHANNEL_BETA = "beta"
 CHANNEL_RELEASE = "release"
 
-GHCR = "ghcr"
-DOCKERHUB = "dockerhub"
-
 parser = argparse.ArgumentParser()
 parser.add_argument(
     "--tag",
@@ -22,31 +21,21 @@ parser.add_argument(
     required=True,
     help="The suffix of the tag.",
 )
-parser.add_argument(
-    "--registry",
-    type=str,
-    choices=[GHCR, DOCKERHUB],
-    required=False,
-    action="append",
-    help="The registry to build tags for.",
-)
 
 
 def main():
     args = parser.parse_args()
 
     # detect channel from tag
-    match = re.match(r"^(\d+\.\d+)(?:\.\d+)(?:(b\d+)|(-dev\d+))?$", args.tag)
+    match = re.match(r"^(\d+\.\d+)(?:\.\d+)?(b\d+)?$", args.tag)
     major_minor_version = None
-    if match is None:  # eg 2023.12.0-dev20231109-testbranch
-        channel = None  # Ran with custom tag for a branch etc
-    elif match.group(3) is not None:  # eg 2023.12.0-dev20231109
+    if match is None:
         channel = CHANNEL_DEV
-    elif match.group(2) is not None:  # eg 2023.12.0b1
-        channel = CHANNEL_BETA
-    else:  # eg 2023.12.0
+    elif match.group(2) is None:
         major_minor_version = match.group(1)
         channel = CHANNEL_RELEASE
+    else:
+        channel = CHANNEL_BETA
 
     tags_to_push = [args.tag]
     if channel == CHANNEL_DEV:
@@ -64,28 +53,15 @@ def main():
 
     suffix = f"-{args.suffix}" if args.suffix else ""
 
-    image_name = f"esphome/esphome{suffix}"
+    with open(os.environ["GITHUB_OUTPUT"], "w") as f:
+        print(f"channel={channel}", file=f)
+        print(f"image=esphome/esphome{suffix}", file=f)
+        full_tags = []
 
-    print(f"channel={channel}")
-
-    if args.registry is None:
-        args.registry = [GHCR, DOCKERHUB]
-    elif len(args.registry) == 1:
-        if GHCR in args.registry:
-            print(f"image=ghcr.io/{image_name}")
-        if DOCKERHUB in args.registry:
-            print(f"image=docker.io/{image_name}")
-
-    print(f"image_name={image_name}")
-
-    full_tags = []
-
-    for tag in tags_to_push:
-        if GHCR in args.registry:
-            full_tags += [f"ghcr.io/{image_name}:{tag}"]
-        if DOCKERHUB in args.registry:
-            full_tags += [f"docker.io/{image_name}:{tag}"]
-    print(f"tags={','.join(full_tags)}")
+        for tag in tags_to_push:
+            full_tags += [f"ghcr.io/esphome/esphome{suffix}:{tag}"]
+            full_tags += [f"esphome/esphome{suffix}:{tag}"]
+        print(f"tags={','.join(full_tags)}", file=f)
 
 
 if __name__ == "__main__":

docker/ha-addon-rootfs/etc/cont-init.d/30-esphome-fork.sh

@@ -1,47 +0,0 @@
-#!/usr/bin/with-contenv bashio
-# ==============================================================================
-# This file installs the user ESPHome fork if specified.
-# The fork must be up to date with the latest ESPHome dev branch
-# and have no conflicts.
-# This config option only exists in the ESPHome Dev add-on.
-# ==============================================================================
-
-declare esphome_fork
-
-if bashio::config.has_value 'esphome_fork'; then
-  esphome_fork=$(bashio::config 'esphome_fork')
-  # format: [username][/repository]:ref
-  if [[ "$esphome_fork" =~ ^(([^/]+)(/([^:]+))?:)?([^:/]+)$ ]]; then
-    username="${BASH_REMATCH[2]:-esphome}"
-    repository="${BASH_REMATCH[4]:-esphome}"
-    ref="${BASH_REMATCH[5]}"
-  else
-    bashio::exit.nok "Invalid esphome_fork format: $esphome_fork"
-  fi
-  full_url="https://github.com/${username}/${repository}/archive/${ref}.tar.gz"
-  bashio::log.info "Checking forked ESPHome"
-  dev_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-  bashio::log.info "Downloading ESPHome from fork '${esphome_fork}' (${full_url})..."
-  curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq ||
-    bashio::exit.nok "Failed downloading ESPHome fork."
-  bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
-  rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
-  mkdir /esphome
-  tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 ||
-    bashio::exit.nok "Failed installing ESPHome from fork."
-  pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
-  rm -f /tmp/esphome.tar.gz
-  fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")
-
-  if [[ "$fork_version" != "$dev_version" ]]; then
-    bashio::log.error "############################"
-    bashio::log.error "Uninstalled fork as version does not match"
-    bashio::log.error "Update (or ask the author to update) the branch"
-    bashio::log.error "This is important as the dev addon and the dev ESPHome"
-    bashio::log.error "branch can have changes that are not compatible with old forks"
-    bashio::log.error "and get reported as bugs which we cannot solve easily."
-    bashio::log.error "############################"
-    bashio::exit.nok
-  fi
-  bashio::log.info "Installed ESPHome from fork '${esphome_fork}' (${full_url})..."
-fi

docker/ha-addon-rootfs/etc/s6-overlay/s6-rc.d/esphome/run

@@ -23,6 +23,10 @@ if bashio::config.true 'streamer_mode'; then
     export ESPHOME_STREAMER_MODE=true
 fi
 
+if bashio::config.true 'status_use_ping'; then
+    export ESPHOME_DASHBOARD_USE_PING=true
+fi
+
 if bashio::config.has_value 'relative_url'; then
     export ESPHOME_DASHBOARD_RELATIVE_URL=$(bashio::config 'relative_url')
 fi
@@ -31,23 +35,11 @@ if bashio::config.has_value 'default_compile_process_limit'; then
     export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=$(bashio::config 'default_compile_process_limit')
 else
     if grep -q 'Raspberry Pi 3' /proc/cpuinfo; then
-        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1
+        export ESPHOME_DEFAULT_COMPILE_PROCESS_LIMIT=1;
     fi
 fi
 
 mkdir -p "${pio_cache_base}"
 
-mkdir -p /config/esphome
-
-if bashio::fs.directory_exists '/config/esphome/.esphome'; then
-    bashio::log.info "Migrating old .esphome directory..."
-    if bashio::fs.file_exists '/config/esphome/.esphome/esphome.json'; then
-        mv /config/esphome/.esphome/esphome.json /data/esphome.json
-    fi
-    mkdir -p "/data/storage"
-    mv /config/esphome/.esphome/*.json /data/storage/ || true
-    rm -rf /config/esphome/.esphome
-fi
-
 bashio::log.info "Starting ESPHome dashboard..."
 exec esphome dashboard /config/esphome --socket /var/run/esphome.sock --ha-addon

docker/platformio_install_deps.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python3
+# This script is used in the docker containers to preinstall
+# all platformio libraries in the global storage
+
+import configparser
+import subprocess
+import sys
+
+config = configparser.ConfigParser(inline_comment_prefixes=(';', ))
+config.read(sys.argv[1])
+
+libs = []
+# Extract from every lib_deps key in all sections
+for section in config.sections():
+    conf = config[section]
+    if "lib_deps" not in conf:
+        continue
+    for lib_dep in conf["lib_deps"].splitlines():
+        if not lib_dep:
+            # Empty line or comment
+            continue
+        if lib_dep.startswith("${"):
+            # Extending from another section
+            continue
+        if "@" not in lib_dep:
+            # No version pinned, this is an internal lib
+            continue
+        libs.append(lib_dep)
+
+subprocess.check_call(['platformio', 'lib', '-g', 'install', *libs])

esphome/__main__.py

@@ -1,59 +1,48 @@
-# PYTHON_ARGCOMPLETE_OK
 import argparse
-from datetime import datetime
 import functools
-import importlib
 import logging
 import os
 import re
 import sys
 import time
-
-import argcomplete
+from datetime import datetime
 
 from esphome import const, writer, yaml_util
 import esphome.codegen as cg
-from esphome.config import iter_component_configs, read_config, strip_default_ids
+from esphome.config import iter_components, read_config, strip_default_ids
 from esphome.const import (
     ALLOWED_NAME_CHARS,
     CONF_BAUD_RATE,
     CONF_BROKER,
     CONF_DEASSERT_RTS_DTR,
-    CONF_DISABLED,
-    CONF_ESPHOME,
-    CONF_LEVEL,
-    CONF_LOG_TOPIC,
     CONF_LOGGER,
-    CONF_MDNS,
-    CONF_MQTT,
     CONF_NAME,
     CONF_OTA,
     CONF_PASSWORD,
-    CONF_PLATFORM,
-    CONF_PLATFORMIO_OPTIONS,
     CONF_PORT,
+    CONF_ESPHOME,
+    CONF_PLATFORMIO_OPTIONS,
     CONF_SUBSTITUTIONS,
-    CONF_TOPIC,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
     PLATFORM_RP2040,
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
-from esphome.helpers import get_bool_env, indent, is_ip_address
-from esphome.log import AnsiFore, color, setup_log
+from esphome.helpers import indent
 from esphome.util import (
-    get_serial_ports,
-    list_yaml_files,
     run_external_command,
     run_external_process,
     safe_print,
+    list_yaml_files,
+    get_serial_ports,
 )
+from esphome.log import color, setup_log, Fore
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def choose_prompt(options, purpose: str = None):
+def choose_prompt(options):
     if not options:
         raise EsphomeError(
             "Found no valid options for upload/logging, please make sure relevant "
@@ -64,11 +53,9 @@ def choose_prompt(options, purpose: str = None):
     if len(options) == 1:
         return options[0][1]
 
-    safe_print(
-        f"Found multiple options{f' for {purpose}' if purpose else ''}, please choose one:"
-    )
+    safe_print("Found multiple options, please choose one:")
     for i, (desc, _) in enumerate(options):
-        safe_print(f"  [{i + 1}] {desc}")
+        safe_print(f"  [{i+1}] {desc}")
 
     while True:
         opt = input("(number): ")
@@ -81,46 +68,27 @@ def choose_prompt(options, purpose: str = None):
                 raise ValueError
             break
         except ValueError:
-            safe_print(color(AnsiFore.RED, f"Invalid option: '{opt}'"))
+            safe_print(color(Fore.RED, f"Invalid option: '{opt}'"))
     return options[opt - 1][1]
 
 
-def choose_upload_log_host(
-    default, check_default, show_ota, show_mqtt, show_api, purpose: str = None
-):
+def choose_upload_log_host(default, check_default, show_ota, show_mqtt, show_api):
     options = []
     for port in get_serial_ports():
         options.append((f"{port.path} ({port.description})", port.path))
-    if default == "SERIAL":
-        return choose_prompt(options, purpose=purpose)
     if (show_ota and "ota" in CORE.config) or (show_api and "api" in CORE.config):
         options.append((f"Over The Air ({CORE.address})", CORE.address))
         if default == "OTA":
             return CORE.address
-    if (
-        show_mqtt
-        and (mqtt_config := CORE.config.get(CONF_MQTT))
-        and mqtt_logging_enabled(mqtt_config)
-    ):
-        options.append((f"MQTT ({mqtt_config[CONF_BROKER]})", "MQTT"))
+    if show_mqtt and "mqtt" in CORE.config:
+        options.append((f"MQTT ({CORE.config['mqtt'][CONF_BROKER]})", "MQTT"))
         if default == "OTA":
             return "MQTT"
     if default is not None:
         return default
     if check_default is not None and check_default in [opt[1] for opt in options]:
         return check_default
-    return choose_prompt(options, purpose=purpose)
-
-
-def mqtt_logging_enabled(mqtt_config):
-    log_topic = mqtt_config[CONF_LOG_TOPIC]
-    if log_topic is None:
-        return False
-    if CONF_TOPIC not in log_topic:
-        return False
-    if log_topic.get(CONF_LEVEL, None) == "NONE":
-        return False
-    return True
+    return choose_prompt(options)
 
 
 def get_port_type(port):
@@ -131,10 +99,8 @@ def get_port_type(port):
     return "NETWORK"
 
 
-def run_miniterm(config, port, args):
-    from aioesphomeapi import LogParser
+def run_miniterm(config, port):
     import serial
-
     from esphome import platformio_api
 
     if CONF_LOGGER not in config:
@@ -153,11 +119,10 @@ def run_miniterm(config, port, args):
 
     # We can't set to False by default since it leads to toggling and hence
     # ESP32 resets on some platforms.
-    if config["logger"][CONF_DEASSERT_RTS_DTR] or args.reset:
+    if config["logger"][CONF_DEASSERT_RTS_DTR]:
         ser.dtr = False
         ser.rts = False
 
-    parser = LogParser()
     tries = 0
     while tries < 5:
         try:
@@ -174,7 +139,8 @@ def run_miniterm(config, port, args):
                         .decode("utf8", "backslashreplace")
                     )
                     time_str = datetime.now().time().strftime("[%H:%M:%S]")
-                    safe_print(parser.parse_line(line, time_str))
+                    message = time_str + line
+                    safe_print(message)
 
                     backtrace_state = platformio_api.process_stacktrace(
                         config, line, backtrace_state=backtrace_state
@@ -186,8 +152,6 @@ def run_miniterm(config, port, args):
         _LOGGER.error("Could not connect to serial port %s", port)
         return 1
 
-    return 0
-
 
 def wrap_to_code(name, comp):
     coro = coroutine(comp.to_code)
@@ -216,7 +180,7 @@ def write_cpp(config):
 def generate_cpp_contents(config):
     _LOGGER.info("Generating C++ source...")
 
-    for name, component, conf in iter_component_configs(CORE.config):
+    for name, component, conf in iter_components(CORE.config):
         if component.to_code is not None:
             coro = wrap_to_code(name, component)
             CORE.add_job(coro, conf)
@@ -243,16 +207,14 @@ def compile_program(args, config):
     return 0 if idedata is not None else 1
 
 
-def upload_using_esptool(config, port, file, speed):
+def upload_using_esptool(config, port):
     from esphome import platformio_api
 
-    first_baudrate = speed or config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
-        "upload_speed", os.getenv("ESPHOME_UPLOAD_SPEED", "460800")
+    first_baudrate = config[CONF_ESPHOME][CONF_PLATFORMIO_OPTIONS].get(
+        "upload_speed", 460800
     )
 
-    if file is not None:
-        flash_images = [platformio_api.FlashImage(path=file, offset="0x0")]
-    else:
+    def run_esptool(baud_rate):
         idedata = platformio_api.get_idedata(config)
 
         firmware_offset = "0x10000" if CORE.is_esp32 else "0x0"
@@ -263,13 +225,12 @@ def upload_using_esptool(config, port, file, speed):
             *idedata.extra_flash_images,
         ]
 
-    mcu = "esp8266"
-    if CORE.is_esp32:
-        from esphome.components.esp32 import get_esp32_variant
+        mcu = "esp8266"
+        if CORE.is_esp32:
+            from esphome.components.esp32 import get_esp32_variant
 
-        mcu = get_esp32_variant().lower()
+            mcu = get_esp32_variant().lower()
 
-    def run_esptool(baud_rate):
         cmd = [
             "esptool.py",
             "--before",
@@ -308,88 +269,36 @@ def upload_using_esptool(config, port, file, speed):
     return run_esptool(115200)
 
 
-def upload_using_platformio(config, port):
-    from esphome import platformio_api
-
-    upload_args = ["-t", "upload", "-t", "nobuild"]
-    if port is not None:
-        upload_args += ["--upload-port", port]
-    return platformio_api.run_platformio_cli_run(config, CORE.verbose, *upload_args)
-
-
-def check_permissions(port):
-    if os.name == "posix" and get_port_type(port) == "SERIAL":
-        # Check if we can open selected serial port
-        if not os.access(port, os.F_OK):
-            raise EsphomeError(
-                "The selected serial port does not exist. To resolve this issue, "
-                "check that the device is connected to this computer with a USB cable and that "
-                "the USB cable can be used for data and is not a power-only cable."
-            )
-        if not (os.access(port, os.R_OK | os.W_OK)):
-            raise EsphomeError(
-                "You do not have read or write permission on the selected serial port. "
-                "To resolve this issue, you can add your user to the dialout group "
-                f"by running the following command: sudo usermod -a -G dialout {os.getlogin()}. "
-                "You will need to log out & back in or reboot to activate the new group access."
-            )
-
-
 def upload_program(config, args, host):
-    try:
-        module = importlib.import_module("esphome.components." + CORE.target_platform)
-        if getattr(module, "upload_program")(config, args, host):
-            return 0
-    except AttributeError:
-        pass
-
     if get_port_type(host) == "SERIAL":
-        check_permissions(host)
         if CORE.target_platform in (PLATFORM_ESP32, PLATFORM_ESP8266):
-            file = getattr(args, "file", None)
-            return upload_using_esptool(config, host, file, args.upload_speed)
+            return upload_using_esptool(config, host)
 
         if CORE.target_platform in (PLATFORM_RP2040):
-            return upload_using_platformio(config, args.device)
+            from esphome import platformio_api
 
-        if CORE.is_libretiny:
-            return upload_using_platformio(config, host)
+            upload_args = ["-t", "upload"]
+            if args.device is not None:
+                upload_args += ["--upload-port", args.device]
+            return platformio_api.run_platformio_cli_run(
+                config, CORE.verbose, *upload_args
+            )
 
         return 1  # Unknown target platform
 
-    ota_conf = {}
-    for ota_item in config.get(CONF_OTA, []):
-        if ota_item[CONF_PLATFORM] == CONF_ESPHOME:
-            ota_conf = ota_item
-            break
-
-    if not ota_conf:
-        raise EsphomeError(
-            f"Cannot upload Over the Air as the {CONF_OTA} configuration is not present or does not include {CONF_PLATFORM}: {CONF_ESPHOME}"
-        )
-
     from esphome import espota2
 
-    remote_port = int(ota_conf[CONF_PORT])
+    if CONF_OTA not in config:
+        raise EsphomeError(
+            "Cannot upload Over the Air as the config does not include the ota: "
+            "component"
+        )
+
+    ota_conf = config[CONF_OTA]
+    remote_port = ota_conf[CONF_PORT]
     password = ota_conf.get(CONF_PASSWORD, "")
-
-    if (
-        CONF_MQTT in config  # pylint: disable=too-many-boolean-expressions
-        and (not args.device or args.device in ("MQTT", "OTA"))
-        and (
-            ((config[CONF_MDNS][CONF_DISABLED]) and not is_ip_address(CORE.address))
-            or get_port_type(host) == "MQTT"
-        )
-    ):
-        from esphome import mqtt
-
-        host = mqtt.get_esphome_device_ip(
-            config, args.username, args.password, args.client_id
-        )
-
     if getattr(args, "file", None) is not None:
         return espota2.run_ota(host, remote_port, password, args.file)
-
     return espota2.run_ota(host, remote_port, password, CORE.firmware_bin)
 
 
@@ -397,16 +306,8 @@ def show_logs(config, args, port):
     if "logger" not in config:
         raise EsphomeError("Logger is not configured!")
     if get_port_type(port) == "SERIAL":
-        check_permissions(port)
-        return run_miniterm(config, port, args)
+        return run_miniterm(config, port)
     if get_port_type(port) == "NETWORK" and "api" in config:
-        if config[CONF_MDNS][CONF_DISABLED] and CONF_MQTT in config:
-            from esphome import mqtt
-
-            port = mqtt.get_esphome_device_ip(
-                config, args.username, args.password, args.client_id
-            )[0]
-
         from esphome.components.api.client import run_logs
 
         return run_logs(config, port)
@@ -435,17 +336,10 @@ def command_wizard(args):
 
 
 def command_config(args, config):
+    _LOGGER.info("Configuration is valid!")
     if not CORE.verbose:
         config = strip_default_ids(config)
-    output = yaml_util.dump(config, args.show_secrets)
-    # add the console decoration so the front-end can hide the secrets
-    if not args.show_secrets:
-        output = re.sub(
-            r"(password|key|psk|ssid)\: (.+)", r"\1: \\033[5m\2\\033[6m", output
-        )
-    if not CORE.quiet:
-        safe_print(output)
-    _LOGGER.info("Configuration is valid!")
+    safe_print(yaml_util.dump(config, args.show_secrets))
     return 0
 
 
@@ -478,7 +372,6 @@ def command_upload(args, config):
         show_ota=True,
         show_mqtt=False,
         show_api=False,
-        purpose="uploading",
     )
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
@@ -487,15 +380,6 @@ def command_upload(args, config):
     return 0
 
 
-def command_discover(args, config):
-    if "mqtt" in config:
-        from esphome import mqtt
-
-        return mqtt.show_discover(config, args.username, args.password, args.client_id)
-
-    raise EsphomeError("No discover method configured (mqtt)")
-
-
 def command_logs(args, config):
     port = choose_upload_log_host(
         default=args.device,
@@ -503,7 +387,6 @@ def command_logs(args, config):
         show_ota=False,
         show_mqtt=True,
         show_api=True,
-        purpose="logging",
     )
     return show_logs(config, args, port)
 
@@ -516,22 +399,12 @@ def command_run(args, config):
     if exit_code != 0:
         return exit_code
     _LOGGER.info("Successfully compiled program.")
-    if CORE.is_host:
-        from esphome.platformio_api import get_idedata
-
-        idedata = get_idedata(config)
-        if idedata is None:
-            return 1
-        program_path = idedata.raw["prog_path"]
-        return run_external_process(program_path)
-
     port = choose_upload_log_host(
         default=args.device,
         check_default=None,
         show_ota=True,
         show_mqtt=False,
         show_api=True,
-        purpose="uploading",
     )
     exit_code = upload_program(config, args, port)
     if exit_code != 0:
@@ -545,7 +418,6 @@ def command_run(args, config):
         show_ota=False,
         show_mqtt=True,
         show_api=True,
-        purpose="logging",
     )
     return show_logs(config, args, port)
 
@@ -578,7 +450,7 @@ def command_clean(args, config):
 def command_dashboard(args):
     from esphome.dashboard import dashboard
 
-    return dashboard.start_dashboard(args)
+    return dashboard.start_web_server(args)
 
 
 def command_update_all(args):
@@ -592,46 +464,40 @@ def command_update_all(args):
         middle_text = f" {middle_text} "
         width = len(click.unstyle(middle_text))
         half_line = "=" * ((twidth - width) // 2)
-        safe_print(f"{half_line}{middle_text}{half_line}")
+        click.echo(f"{half_line}{middle_text}{half_line}")
 
     for f in files:
-        safe_print(f"Updating {color(AnsiFore.CYAN, f)}")
-        safe_print("-" * twidth)
-        safe_print()
-        if CORE.dashboard:
-            rc = run_external_process(
-                "esphome", "--dashboard", "run", f, "--no-logs", "--device", "OTA"
-            )
-        else:
-            rc = run_external_process(
-                "esphome", "run", f, "--no-logs", "--device", "OTA"
-            )
+        print(f"Updating {color(Fore.CYAN, f)}")
+        print("-" * twidth)
+        print()
+        rc = run_external_process(
+            "esphome", "--dashboard", "run", f, "--no-logs", "--device", "OTA"
+        )
         if rc == 0:
-            print_bar(f"[{color(AnsiFore.BOLD_GREEN, 'SUCCESS')}] {f}")
+            print_bar(f"[{color(Fore.BOLD_GREEN, 'SUCCESS')}] {f}")
             success[f] = True
         else:
-            print_bar(f"[{color(AnsiFore.BOLD_RED, 'ERROR')}] {f}")
+            print_bar(f"[{color(Fore.BOLD_RED, 'ERROR')}] {f}")
             success[f] = False
 
-        safe_print()
-        safe_print()
-        safe_print()
+        print()
+        print()
+        print()
 
-    print_bar(f"[{color(AnsiFore.BOLD_WHITE, 'SUMMARY')}]")
+    print_bar(f"[{color(Fore.BOLD_WHITE, 'SUMMARY')}]")
     failed = 0
     for f in files:
         if success[f]:
-            safe_print(f"  - {f}: {color(AnsiFore.GREEN, 'SUCCESS')}")
+            print(f"  - {f}: {color(Fore.GREEN, 'SUCCESS')}")
         else:
-            safe_print(f"  - {f}: {color(AnsiFore.BOLD_RED, 'FAILED')}")
+            print(f"  - {f}: {color(Fore.BOLD_RED, 'FAILED')}")
             failed += 1
     return failed
 
 
 def command_idedata(args, config):
-    import json
-
     from esphome import platformio_api
+    import json
 
     logging.disable(logging.INFO)
     logging.disable(logging.WARNING)
@@ -649,7 +515,7 @@ def command_rename(args, config):
         if c not in ALLOWED_NAME_CHARS:
             print(
                 color(
-                    AnsiFore.BOLD_RED,
+                    Fore.BOLD_RED,
                     f"'{c}' is an invalid character for names. Valid characters are: "
                     f"{ALLOWED_NAME_CHARS} (lowercase, no spaces)",
                 )
@@ -662,9 +528,7 @@ def command_rename(args, config):
     yaml = yaml_util.load_yaml(CORE.config_path)
     if CONF_ESPHOME not in yaml or CONF_NAME not in yaml[CONF_ESPHOME]:
         print(
-            color(
-                AnsiFore.BOLD_RED, "Complex YAML files cannot be automatically renamed."
-            )
+            color(Fore.BOLD_RED, "Complex YAML files cannot be automatically renamed.")
         )
         return 1
     old_name = yaml[CONF_ESPHOME][CONF_NAME]
@@ -687,7 +551,7 @@ def command_rename(args, config):
             )
             > 1
         ):
-            print(color(AnsiFore.BOLD_RED, "Too many matches in YAML to safely rename"))
+            print(color(Fore.BOLD_RED, "Too many matches in YAML to safely rename"))
             return 1
 
         new_raw = re.sub(
@@ -699,7 +563,7 @@ def command_rename(args, config):
 
     new_path = os.path.join(CORE.config_dir, args.name + ".yaml")
     print(
-        f"Updating {color(AnsiFore.CYAN, CORE.config_path)} to {color(AnsiFore.CYAN, new_path)}"
+        f"Updating {color(Fore.CYAN, CORE.config_path)} to {color(Fore.CYAN, new_path)}"
     )
     print()
 
@@ -708,7 +572,7 @@ def command_rename(args, config):
 
     rc = run_external_process("esphome", "config", new_path)
     if rc != 0:
-        print(color(AnsiFore.BOLD_RED, "Rename failed. Reverting changes."))
+        print(color(Fore.BOLD_RED, "Rename failed. Reverting changes."))
         os.remove(new_path)
         return 1
 
@@ -731,10 +595,9 @@ def command_rename(args, config):
         os.remove(new_path)
         return 1
 
-    if CORE.config_path != new_path:
-        os.remove(CORE.config_path)
+    os.remove(CORE.config_path)
 
-    print(color(AnsiFore.BOLD_GREEN, "SUCCESS"))
+    print(color(Fore.BOLD_GREEN, "SUCCESS"))
     print()
     return 0
 
@@ -758,30 +621,17 @@ POST_CONFIG_ACTIONS = {
     "clean": command_clean,
     "idedata": command_idedata,
     "rename": command_rename,
-    "discover": command_discover,
 }
 
 
 def parse_args(argv):
     options_parser = argparse.ArgumentParser(add_help=False)
     options_parser.add_argument(
-        "-v",
-        "--verbose",
-        help="Enable verbose ESPHome logs.",
-        action="store_true",
-        default=get_bool_env("ESPHOME_VERBOSE"),
+        "-v", "--verbose", help="Enable verbose ESPHome logs.", action="store_true"
     )
     options_parser.add_argument(
         "-q", "--quiet", help="Disable all ESPHome logs.", action="store_true"
     )
-    options_parser.add_argument(
-        "-l",
-        "--log-level",
-        help="Set the log level.",
-        default=os.getenv("ESPHOME_LOG_LEVEL", "INFO"),
-        action="store",
-        choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
-    )
     options_parser.add_argument(
         "--dashboard", help=argparse.SUPPRESS, action="store_true"
     )
@@ -795,14 +645,7 @@ def parse_args(argv):
     )
 
     parser = argparse.ArgumentParser(
-        description=f"ESPHome {const.__version__}", parents=[options_parser]
-    )
-
-    parser.add_argument(
-        "--version",
-        action="version",
-        version=f"Version: {const.__version__}",
-        help="Print the ESPHome version and exit.",
+        description=f"ESPHome v{const.__version__}", parents=[options_parser]
     )
 
     mqtt_options = argparse.ArgumentParser(add_help=False)
@@ -839,9 +682,7 @@ def parse_args(argv):
     )
 
     parser_upload = subparsers.add_parser(
-        "upload",
-        help="Validate the configuration and upload the latest binary.",
-        parents=[mqtt_options],
+        "upload", help="Validate the configuration and upload the latest binary."
     )
     parser_upload.add_argument(
         "configuration", help="Your YAML configuration file(s).", nargs="+"
@@ -850,10 +691,6 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_upload.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
     parser_upload.add_argument(
         "--file",
         help="Manually specify the binary file to upload.",
@@ -862,7 +699,6 @@ def parse_args(argv):
     parser_logs = subparsers.add_parser(
         "logs",
         help="Validate the configuration and show all logs.",
-        aliases=["log"],
         parents=[mqtt_options],
     )
     parser_logs.add_argument(
@@ -872,22 +708,6 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_logs.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )
-
-    parser_discover = subparsers.add_parser(
-        "discover",
-        help="Validate the configuration and show all discovered devices.",
-        parents=[mqtt_options],
-    )
-    parser_discover.add_argument(
-        "configuration", help="Your YAML configuration file.", nargs=1
-    )
 
     parser_run = subparsers.add_parser(
         "run",
@@ -901,20 +721,9 @@ def parse_args(argv):
         "--device",
         help="Manually specify the serial port/address to use, for example /dev/ttyUSB0.",
     )
-    parser_run.add_argument(
-        "--upload_speed",
-        help="Override the default or configured upload speed.",
-    )
     parser_run.add_argument(
         "--no-logs", help="Disable starting logs.", action="store_true"
     )
-    parser_run.add_argument(
-        "--reset",
-        "-r",
-        action="store_true",
-        help="Reset the device before starting serial logs.",
-        default=os.getenv("ESPHOME_SERIAL_LOGGING_RESET"),
-    )
 
     parser_clean = subparsers.add_parser(
         "clean-mqtt",
@@ -1025,7 +834,67 @@ def parse_args(argv):
     # a deprecation warning).
     arguments = argv[1:]
 
-    argcomplete.autocomplete(parser)
+    # On Python 3.9+ we can simply set exit_on_error=False in the constructor
+    def _raise(x):
+        raise argparse.ArgumentError(None, x)
+
+    # First, try new-style parsing, but don't exit in case of failure
+    try:
+        # duplicate parser so that we can use the original one to raise errors later on
+        current_parser = argparse.ArgumentParser(add_help=False, parents=[parser])
+        current_parser.set_defaults(deprecated_argv_suggestion=None)
+        current_parser.error = _raise
+        return current_parser.parse_args(arguments)
+    except argparse.ArgumentError:
+        pass
+
+    # Second, try compat parsing and rearrange the command-line if it succeeds
+    # Disable argparse's built-in help option and add it manually to prevent this
+    # parser from printing the help messagefor the old format when invoked with -h.
+    compat_parser = argparse.ArgumentParser(parents=[options_parser], add_help=False)
+    compat_parser.add_argument("-h", "--help", action="store_true")
+    compat_parser.add_argument("configuration", nargs="*")
+    compat_parser.add_argument(
+        "command",
+        choices=[
+            "config",
+            "compile",
+            "upload",
+            "logs",
+            "run",
+            "clean-mqtt",
+            "wizard",
+            "mqtt-fingerprint",
+            "version",
+            "clean",
+            "dashboard",
+            "vscode",
+            "update-all",
+        ],
+    )
+
+    try:
+        compat_parser.error = _raise
+        result, unparsed = compat_parser.parse_known_args(argv[1:])
+        last_option = len(arguments) - len(unparsed) - 1 - len(result.configuration)
+        unparsed = [
+            "--device" if arg in ("--upload-port", "--serial-port") else arg
+            for arg in unparsed
+        ]
+        arguments = (
+            arguments[0:last_option]
+            + [result.command]
+            + result.configuration
+            + unparsed
+        )
+        deprecated_argv_suggestion = arguments
+    except argparse.ArgumentError:
+        # old-style parsing failed, don't suggest any argument
+        deprecated_argv_suggestion = None
+
+    # Finally, run the new-style parser again with the possibly swapped arguments,
+    # and let it error out if the command is unparsable.
+    parser.set_defaults(deprecated_argv_suggestion=deprecated_argv_suggestion)
     return parser.parse_args(arguments)
 
 
@@ -1033,17 +902,26 @@ def run_esphome(argv):
     args = parse_args(argv)
     CORE.dashboard = args.dashboard
 
-    # Override log level if verbose is set
-    if args.verbose:
-        args.log_level = "DEBUG"
-    elif args.quiet:
-        args.log_level = "CRITICAL"
-
     setup_log(
-        log_level=args.log_level,
+        args.verbose,
+        args.quiet,
         # Show timestamp for dashboard access logs
-        include_timestamp=args.command == "dashboard",
+        args.command == "dashboard",
     )
+    if args.deprecated_argv_suggestion is not None and args.command != "vscode":
+        _LOGGER.warning(
+            "Calling ESPHome with the configuration before the command is deprecated "
+            "and will be removed in the future. "
+        )
+        _LOGGER.warning("Please instead use:")
+        _LOGGER.warning("   esphome %s", " ".join(args.deprecated_argv_suggestion))
+
+    if sys.version_info < (3, 8, 0):
+        _LOGGER.error(
+            "You're running ESPHome with Python <3.8. ESPHome is no longer compatible "
+            "with this Python version. Please reinstall ESPHome with Python 3.8+"
+        )
+        return 1
 
     if args.command in PRE_CONFIG_ACTIONS:
         try:
@@ -1052,8 +930,6 @@ def run_esphome(argv):
             _LOGGER.error(e, exc_info=args.verbose)
             return 1
 
-    _LOGGER.info("ESPHome %s", const.__version__)
-
     for conf_path in args.configuration:
         if any(os.path.basename(conf_path) == x for x in SECRETS_FILES):
             _LOGGER.warning("Skipping secrets file %s", conf_path)

esphome/automation.py

@@ -1,39 +1,26 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import (
-    CONF_ALL,
-    CONF_ANY,
     CONF_AUTOMATION_ID,
     CONF_CONDITION,
     CONF_COUNT,
     CONF_ELSE,
     CONF_ID,
     CONF_THEN,
-    CONF_TIME,
     CONF_TIMEOUT,
     CONF_TRIGGER_ID,
     CONF_TYPE_ID,
-    CONF_UPDATE_INTERVAL,
+    CONF_TIME,
 )
 from esphome.schema_extractors import SCHEMA_EXTRACT, schema_extractor
 from esphome.util import Registry
 
 
 def maybe_simple_id(*validators):
-    """Allow a raw ID to be specified in place of a config block.
-    If the value that's being validated is a dictionary, it's passed as-is to the specified validators. Otherwise, it's
-    wrapped in a dict that looks like ``{"id": <value>}``, and that dict is then handed off to the specified validators.
-    """
     return maybe_conf(CONF_ID, *validators)
 
 
 def maybe_conf(conf, *validators):
-    """Allow a raw value to be specified in place of a config block.
-    If the value that's being validated is a dictionary, it's passed as-is to the specified validators. Otherwise, it's
-    wrapped in a dict that looks like ``{<conf>: <value>}``, and that dict is then handed off to the specified
-    validators.
-    (This is a general case of ``maybe_simple_id`` that allows the wrapping key to be something other than ``id``.)
-    """
     validator = cv.All(*validators)
 
     @schema_extractor("maybe")
@@ -75,13 +62,6 @@ def validate_potentially_and_condition(value):
     return validate_condition(value)
 
 
-def validate_potentially_or_condition(value):
-    if isinstance(value, list):
-        with cv.remove_prepend_path(["or"]):
-            return validate_condition({"or": value})
-    return validate_condition(value)
-
-
 DelayAction = cg.esphome_ns.class_("DelayAction", Action, cg.Component)
 LambdaAction = cg.esphome_ns.class_("LambdaAction", Action)
 IfAction = cg.esphome_ns.class_("IfAction", Action)
@@ -89,8 +69,6 @@ WhileAction = cg.esphome_ns.class_("WhileAction", Action)
 RepeatAction = cg.esphome_ns.class_("RepeatAction", Action)
 WaitUntilAction = cg.esphome_ns.class_("WaitUntilAction", Action, cg.Component)
 UpdateComponentAction = cg.esphome_ns.class_("UpdateComponentAction", Action)
-SuspendComponentAction = cg.esphome_ns.class_("SuspendComponentAction", Action)
-ResumeComponentAction = cg.esphome_ns.class_("ResumeComponentAction", Action)
 Automation = cg.esphome_ns.class_("Automation")
 
 LambdaCondition = cg.esphome_ns.class_("LambdaCondition", Condition)
@@ -160,7 +138,6 @@ AUTOMATION_SCHEMA = cv.Schema(
 AndCondition = cg.esphome_ns.class_("AndCondition", Condition)
 OrCondition = cg.esphome_ns.class_("OrCondition", Condition)
 NotCondition = cg.esphome_ns.class_("NotCondition", Condition)
-XorCondition = cg.esphome_ns.class_("XorCondition", Condition)
 
 
 @register_condition("and", AndCondition, validate_condition_list)
@@ -175,30 +152,12 @@ async def or_condition_to_code(config, condition_id, template_arg, args):
     return cg.new_Pvariable(condition_id, template_arg, conditions)
 
 
-@register_condition("all", AndCondition, validate_condition_list)
-async def all_condition_to_code(config, condition_id, template_arg, args):
-    conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(condition_id, template_arg, conditions)
-
-
-@register_condition("any", OrCondition, validate_condition_list)
-async def any_condition_to_code(config, condition_id, template_arg, args):
-    conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(condition_id, template_arg, conditions)
-
-
 @register_condition("not", NotCondition, validate_potentially_and_condition)
 async def not_condition_to_code(config, condition_id, template_arg, args):
     condition = await build_condition(config, template_arg, args)
     return cg.new_Pvariable(condition_id, template_arg, condition)
 
 
-@register_condition("xor", XorCondition, validate_condition_list)
-async def xor_condition_to_code(config, condition_id, template_arg, args):
-    conditions = await build_condition_list(config, template_arg, args)
-    return cg.new_Pvariable(condition_id, template_arg, conditions)
-
-
 @register_condition("lambda", LambdaCondition, cv.returning_lambda)
 async def lambda_condition_to_code(config, condition_id, template_arg, args):
     lambda_ = await cg.process_lambda(config, args, return_type=bool)
@@ -244,21 +203,15 @@ async def delay_action_to_code(config, action_id, template_arg, args):
     IfAction,
     cv.All(
         {
-            cv.Exclusive(
-                CONF_CONDITION, CONF_CONDITION
-            ): validate_potentially_and_condition,
-            cv.Exclusive(CONF_ANY, CONF_CONDITION): validate_potentially_or_condition,
-            cv.Exclusive(CONF_ALL, CONF_CONDITION): validate_potentially_and_condition,
+            cv.Required(CONF_CONDITION): validate_potentially_and_condition,
             cv.Optional(CONF_THEN): validate_action_list,
             cv.Optional(CONF_ELSE): validate_action_list,
         },
         cv.has_at_least_one_key(CONF_THEN, CONF_ELSE),
-        cv.has_at_least_one_key(CONF_CONDITION, CONF_ANY, CONF_ALL),
     ),
 )
 async def if_action_to_code(config, action_id, template_arg, args):
-    cond_conf = next(el for el in config if el in (CONF_ANY, CONF_ALL, CONF_CONDITION))
-    conditions = await build_condition(config[cond_conf], template_arg, args)
+    conditions = await build_condition(config[CONF_CONDITION], template_arg, args)
     var = cg.new_Pvariable(action_id, template_arg, conditions)
     if CONF_THEN in config:
         actions = await build_action_list(config[CONF_THEN], template_arg, args)
@@ -301,11 +254,7 @@ async def repeat_action_to_code(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     count_template = await cg.templatable(config[CONF_COUNT], args, cg.uint32)
     cg.add(var.set_count(count_template))
-    actions = await build_action_list(
-        config[CONF_THEN],
-        cg.TemplateArguments(cg.uint32, *template_arg.args),
-        [(cg.uint32, "iteration"), *args],
-    )
+    actions = await build_action_list(config[CONF_THEN], template_arg, args)
     cg.add(var.add_then(actions))
     return var
 
@@ -350,41 +299,6 @@ async def component_update_action_to_code(config, action_id, template_arg, args)
     return cg.new_Pvariable(action_id, template_arg, comp)
 
 
-@register_action(
-    "component.suspend",
-    SuspendComponentAction,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(cg.PollingComponent),
-        }
-    ),
-)
-async def component_suspend_action_to_code(config, action_id, template_arg, args):
-    comp = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, comp)
-
-
-@register_action(
-    "component.resume",
-    ResumeComponentAction,
-    maybe_simple_id(
-        {
-            cv.Required(CONF_ID): cv.use_id(cg.PollingComponent),
-            cv.Optional(CONF_UPDATE_INTERVAL): cv.templatable(
-                cv.positive_time_period_milliseconds
-            ),
-        }
-    ),
-)
-async def component_resume_action_to_code(config, action_id, template_arg, args):
-    comp = await cg.get_variable(config[CONF_ID])
-    var = cg.new_Pvariable(action_id, template_arg, comp)
-    if CONF_UPDATE_INTERVAL in config:
-        template_ = await cg.templatable(config[CONF_UPDATE_INTERVAL], args, int)
-        cg.add(var.set_update_interval(template_))
-    return var
-
-
 async def build_action(full_config, template_arg, args):
     registry_entry, config = cg.extract_registry_entry_config(
         ACTION_REGISTRY, full_config

esphome/codegen.py

@@ -8,88 +8,81 @@
 # want to break suddenly due to a rename (this file will get backports for features).
 
 # pylint: disable=unused-import
-from esphome.cpp_generator import (  # noqa: F401
-    ArrayInitializer,
+from esphome.cpp_generator import (  # noqa
     Expression,
-    LineComment,
-    MockObj,
-    MockObjClass,
-    Pvariable,
     RawExpression,
     RawStatement,
-    Statement,
-    StructInitializer,
     TemplateArguments,
+    StructInitializer,
+    ArrayInitializer,
+    safe_exp,
+    Statement,
+    LineComment,
+    progmem_array,
+    static_const_array,
+    statement,
+    variable,
+    with_local_variable,
+    new_variable,
+    Pvariable,
+    new_Pvariable,
     add,
-    add_build_flag,
-    add_build_unflag,
-    add_define,
     add_global,
     add_library,
+    add_build_flag,
+    add_define,
     add_platformio_option,
     get_variable,
     get_variable_with_full_id,
-    is_template,
-    new_Pvariable,
-    new_variable,
     process_lambda,
-    progmem_array,
-    safe_exp,
-    set_cpp_standard,
-    statement,
-    static_const_array,
+    is_template,
     templatable,
-    variable,
-    with_local_variable,
+    MockObj,
+    MockObjClass,
 )
-from esphome.cpp_helpers import (  # noqa: F401
+from esphome.cpp_helpers import (  # noqa
+    gpio_pin_expression,
+    register_component,
     build_registry_entry,
     build_registry_list,
     extract_registry_entry_config,
-    gpio_pin_expression,
-    past_safe_mode,
-    register_component,
     register_parented,
 )
-from esphome.cpp_types import (  # noqa: F401
-    NAN,
-    App,
-    Application,
-    Component,
-    ComponentPtr,
-    Controller,
-    EntityBase,
-    EntityCategory,
-    ESPTime,
-    GPIOPin,
-    InternalGPIOPin,
-    JsonObject,
-    JsonObjectConst,
-    Parented,
-    PollingComponent,
-    arduino_json_ns,
-    bool_,
-    const_char_ptr,
-    double,
-    esphome_ns,
-    float_,
+from esphome.cpp_types import (  # noqa
     global_ns,
-    gpio_Flags,
-    int16,
-    int32,
-    int64,
-    int_,
+    void,
     nullptr,
-    optional,
-    size_t,
+    float_,
+    double,
+    bool_,
+    int_,
     std_ns,
-    std_shared_ptr,
     std_string,
-    std_string_ref,
     std_vector,
     uint8,
     uint16,
     uint32,
     uint64,
-    void,
+    int32,
+    int64,
+    size_t,
+    const_char_ptr,
+    NAN,
+    esphome_ns,
+    App,
+    EntityBase,
+    Component,
+    ComponentPtr,
+    PollingComponent,
+    Application,
+    optional,
+    arduino_json_ns,
+    JsonObject,
+    JsonObjectConst,
+    Controller,
+    GPIOPin,
+    InternalGPIOPin,
+    gpio_Flags,
+    EntityCategory,
+    Parented,
 )

esphome/components/a01nyub/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@MrSuicideParrot"]

esphome/components/a01nyub/a01nyub.cpp

@@ -1,44 +0,0 @@
-// Datasheet https://wiki.dfrobot.com/A01NYUB%20Waterproof%20Ultrasonic%20Sensor%20SKU:%20SEN0313
-
-#include "a01nyub.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace a01nyub {
-
-static const char *const TAG = "a01nyub.sensor";
-
-void A01nyubComponent::loop() {
-  uint8_t data;
-  while (this->available() > 0) {
-    this->read_byte(&data);
-    if (this->buffer_.empty() && (data != 0xff))
-      continue;
-    buffer_.push_back(data);
-    if (this->buffer_.size() == 4)
-      this->check_buffer_();
-  }
-}
-
-void A01nyubComponent::check_buffer_() {
-  uint8_t checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
-  if (this->buffer_[3] == checksum) {
-    float distance = (this->buffer_[1] << 8) + this->buffer_[2];
-    if (distance > 280) {
-      float meters = distance / 1000.0;
-      ESP_LOGV(TAG, "Distance from sensor: %f mm, %f m", distance, meters);
-      this->publish_state(meters);
-    } else {
-      ESP_LOGW(TAG, "Invalid data read from sensor: %s", format_hex_pretty(this->buffer_).c_str());
-    }
-  } else {
-    ESP_LOGW(TAG, "checksum failed: %02x != %02x", checksum, this->buffer_[3]);
-  }
-  this->buffer_.clear();
-}
-
-void A01nyubComponent::dump_config() { LOG_SENSOR("", "A01nyub Sensor", this); }
-
-}  // namespace a01nyub
-}  // namespace esphome

esphome/components/a01nyub/a01nyub.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-
-namespace esphome {
-namespace a01nyub {
-
-class A01nyubComponent : public sensor::Sensor, public Component, public uart::UARTDevice {
- public:
-  // Nothing really public.
-
-  // ========== INTERNAL METHODS ==========
-  void loop() override;
-  void dump_config() override;
-
- protected:
-  void check_buffer_();
-
-  std::vector<uint8_t> buffer_;
-};
-
-}  // namespace a01nyub
-}  // namespace esphome

esphome/components/a01nyub/sensor.py

@@ -1,41 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_METER,
-)
-
-CODEOWNERS = ["@MrSuicideParrot"]
-DEPENDENCIES = ["uart"]
-
-a01nyub_ns = cg.esphome_ns.namespace("a01nyub")
-A01nyubComponent = a01nyub_ns.class_(
-    "A01nyubComponent", sensor.Sensor, cg.Component, uart.UARTDevice
-)
-
-CONFIG_SCHEMA = sensor.sensor_schema(
-    A01nyubComponent,
-    unit_of_measurement=UNIT_METER,
-    icon=ICON_ARROW_EXPAND_VERTICAL,
-    accuracy_decimals=3,
-    state_class=STATE_CLASS_MEASUREMENT,
-    device_class=DEVICE_CLASS_DISTANCE,
-).extend(uart.UART_DEVICE_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "a01nyub",
-    baud_rate=9600,
-    require_tx=False,
-    require_rx=True,
-    data_bits=8,
-    parity=None,
-    stop_bits=1,
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)

esphome/components/a02yyuw/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@TH-Braemer"]

esphome/components/a02yyuw/a02yyuw.cpp

@@ -1,43 +0,0 @@
-// Datasheet https://wiki.dfrobot.com/_A02YYUW_Waterproof_Ultrasonic_Sensor_SKU_SEN0311
-
-#include "a02yyuw.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace a02yyuw {
-
-static const char *const TAG = "a02yyuw.sensor";
-
-void A02yyuwComponent::loop() {
-  uint8_t data;
-  while (this->available() > 0) {
-    this->read_byte(&data);
-    if (this->buffer_.empty() && (data != 0xff))
-      continue;
-    buffer_.push_back(data);
-    if (this->buffer_.size() == 4)
-      this->check_buffer_();
-  }
-}
-
-void A02yyuwComponent::check_buffer_() {
-  uint8_t checksum = this->buffer_[0] + this->buffer_[1] + this->buffer_[2];
-  if (this->buffer_[3] == checksum) {
-    float distance = (this->buffer_[1] << 8) + this->buffer_[2];
-    if (distance > 30) {
-      ESP_LOGV(TAG, "Distance from sensor: %f mm", distance);
-      this->publish_state(distance);
-    } else {
-      ESP_LOGW(TAG, "Invalid data read from sensor: %s", format_hex_pretty(this->buffer_).c_str());
-    }
-  } else {
-    ESP_LOGW(TAG, "checksum failed: %02x != %02x", checksum, this->buffer_[3]);
-  }
-  this->buffer_.clear();
-}
-
-void A02yyuwComponent::dump_config() { LOG_SENSOR("", "A02yyuw Sensor", this); }
-
-}  // namespace a02yyuw
-}  // namespace esphome

esphome/components/a02yyuw/a02yyuw.h

@@ -1,27 +0,0 @@
-#pragma once
-
-#include <vector>
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-#include "esphome/components/uart/uart.h"
-
-namespace esphome {
-namespace a02yyuw {
-
-class A02yyuwComponent : public sensor::Sensor, public Component, public uart::UARTDevice {
- public:
-  // Nothing really public.
-
-  // ========== INTERNAL METHODS ==========
-  void loop() override;
-  void dump_config() override;
-
- protected:
-  void check_buffer_();
-
-  std::vector<uint8_t> buffer_;
-};
-
-}  // namespace a02yyuw
-}  // namespace esphome

esphome/components/a02yyuw/sensor.py

@@ -1,41 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor, uart
-from esphome.const import (
-    DEVICE_CLASS_DISTANCE,
-    ICON_ARROW_EXPAND_VERTICAL,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_MILLIMETER,
-)
-
-CODEOWNERS = ["@TH-Braemer"]
-DEPENDENCIES = ["uart"]
-
-a02yyuw_ns = cg.esphome_ns.namespace("a02yyuw")
-A02yyuwComponent = a02yyuw_ns.class_(
-    "A02yyuwComponent", sensor.Sensor, cg.Component, uart.UARTDevice
-)
-
-CONFIG_SCHEMA = sensor.sensor_schema(
-    A02yyuwComponent,
-    unit_of_measurement=UNIT_MILLIMETER,
-    icon=ICON_ARROW_EXPAND_VERTICAL,
-    accuracy_decimals=0,
-    state_class=STATE_CLASS_MEASUREMENT,
-    device_class=DEVICE_CLASS_DISTANCE,
-).extend(uart.UART_DEVICE_SCHEMA)
-
-FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
-    "a02yyuw",
-    baud_rate=9600,
-    require_tx=False,
-    require_rx=True,
-    data_bits=8,
-    parity=None,
-    stop_bits=1,
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-    await uart.register_uart_device(var, config)

esphome/components/a4988/a4988.cpp

@@ -7,7 +7,7 @@ namespace a4988 {
 static const char *const TAG = "a4988.stepper";
 
 void A4988::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
+  ESP_LOGCONFIG(TAG, "Setting up A4988...");
   if (this->sleep_pin_ != nullptr) {
     this->sleep_pin_->setup();
     this->sleep_pin_->digital_write(false);

esphome/components/a4988/stepper.py

@@ -1,9 +1,10 @@
 from esphome import pins
-import esphome.codegen as cg
 from esphome.components import stepper
 import esphome.config_validation as cv
+import esphome.codegen as cg
 from esphome.const import CONF_DIR_PIN, CONF_ID, CONF_SLEEP_PIN, CONF_STEP_PIN
 
+
 a4988_ns = cg.esphome_ns.namespace("a4988")
 A4988 = a4988_ns.class_("A4988", stepper.Stepper, cg.Component)
 
@@ -27,6 +28,6 @@ async def to_code(config):
     dir_pin = await cg.gpio_pin_expression(config[CONF_DIR_PIN])
     cg.add(var.set_dir_pin(dir_pin))
 
-    if sleep_pin_config := config.get(CONF_SLEEP_PIN):
-        sleep_pin = await cg.gpio_pin_expression(sleep_pin_config)
+    if CONF_SLEEP_PIN in config:
+        sleep_pin = await cg.gpio_pin_expression(config[CONF_SLEEP_PIN])
         cg.add(var.set_sleep_pin(sleep_pin))

esphome/components/absolute_humidity/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@DAVe3283"]

esphome/components/absolute_humidity/absolute_humidity.cpp

@@ -1,184 +0,0 @@
-#include "esphome/core/log.h"
-#include "absolute_humidity.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-static const char *const TAG = "absolute_humidity.sensor";
-
-void AbsoluteHumidityComponent::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
-
-  ESP_LOGD(TAG, "  Added callback for temperature '%s'", this->temperature_sensor_->get_name().c_str());
-  this->temperature_sensor_->add_on_state_callback([this](float state) { this->temperature_callback_(state); });
-  if (this->temperature_sensor_->has_state()) {
-    this->temperature_callback_(this->temperature_sensor_->get_state());
-  }
-
-  ESP_LOGD(TAG, "  Added callback for relative humidity '%s'", this->humidity_sensor_->get_name().c_str());
-  this->humidity_sensor_->add_on_state_callback([this](float state) { this->humidity_callback_(state); });
-  if (this->humidity_sensor_->has_state()) {
-    this->humidity_callback_(this->humidity_sensor_->get_state());
-  }
-}
-
-void AbsoluteHumidityComponent::dump_config() {
-  LOG_SENSOR("", "Absolute Humidity", this);
-
-  switch (this->equation_) {
-    case BUCK:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Buck");
-      break;
-    case TETENS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Tetens");
-      break;
-    case WOBUS:
-      ESP_LOGCONFIG(TAG, "Saturation Vapor Pressure Equation: Wobus");
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      break;
-  }
-
-  ESP_LOGCONFIG(TAG,
-                "Sources\n"
-                "  Temperature: '%s'\n"
-                "  Relative Humidity: '%s'",
-                this->temperature_sensor_->get_name().c_str(), this->humidity_sensor_->get_name().c_str());
-}
-
-float AbsoluteHumidityComponent::get_setup_priority() const { return setup_priority::DATA; }
-
-void AbsoluteHumidityComponent::loop() {
-  if (!this->next_update_) {
-    return;
-  }
-  this->next_update_ = false;
-
-  // Ensure we have source data
-  const bool no_temperature = std::isnan(this->temperature_);
-  const bool no_humidity = std::isnan(this->humidity_);
-  if (no_temperature || no_humidity) {
-    if (no_temperature) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    if (no_humidity) {
-      ESP_LOGW(TAG, "No valid state from temperature sensor!");
-    }
-    ESP_LOGW(TAG, "Unable to calculate absolute humidity.");
-    this->publish_state(NAN);
-    this->status_set_warning();
-    return;
-  }
-
-  // Convert to desired units
-  const float temperature_c = this->temperature_;
-  const float temperature_k = temperature_c + 273.15;
-  const float hr = this->humidity_ / 100;
-
-  // Calculate saturation vapor pressure
-  float es;
-  switch (this->equation_) {
-    case BUCK:
-      es = es_buck(temperature_c);
-      break;
-    case TETENS:
-      es = es_tetens(temperature_c);
-      break;
-    case WOBUS:
-      es = es_wobus(temperature_c);
-      break;
-    default:
-      ESP_LOGE(TAG, "Invalid saturation vapor pressure equation selection!");
-      this->publish_state(NAN);
-      this->status_set_error();
-      return;
-  }
-  ESP_LOGD(TAG, "Saturation vapor pressure %f kPa", es);
-
-  // Calculate absolute humidity
-  const float absolute_humidity = vapor_density(es, hr, temperature_k);
-
-  // Publish absolute humidity
-  ESP_LOGD(TAG, "Publishing absolute humidity %f g/m³", absolute_humidity);
-  this->status_clear_warning();
-  this->publish_state(absolute_humidity);
-}
-
-// Buck equation (https://en.wikipedia.org/wiki/Arden_Buck_equation)
-// More accurate than Tetens in normal meteorologic conditions
-float AbsoluteHumidityComponent::es_buck(float temperature_c) {
-  float a, b, c, d;
-  if (temperature_c >= 0) {
-    a = 0.61121;
-    b = 18.678;
-    c = 234.5;
-    d = 257.14;
-  } else {
-    a = 0.61115;
-    b = 18.678;
-    c = 233.7;
-    d = 279.82;
-  }
-  return a * expf((b - (temperature_c / c)) * (temperature_c / (d + temperature_c)));
-}
-
-// Tetens equation (https://en.wikipedia.org/wiki/Tetens_equation)
-float AbsoluteHumidityComponent::es_tetens(float temperature_c) {
-  float a, b;
-  if (temperature_c >= 0) {
-    a = 17.27;
-    b = 237.3;
-  } else {
-    a = 21.875;
-    b = 265.5;
-  }
-  return 0.61078 * expf((a * temperature_c) / (temperature_c + b));
-}
-
-// Wobus equation
-// https://wahiduddin.net/calc/density_altitude.htm
-// https://wahiduddin.net/calc/density_algorithms.htm
-// Calculate the saturation vapor pressure (kPa)
-float AbsoluteHumidityComponent::es_wobus(float t) {
-  // THIS FUNCTION RETURNS THE SATURATION VAPOR PRESSURE ESW (MILLIBARS)
-  // OVER LIQUID WATER GIVEN THE TEMPERATURE T (CELSIUS). THE POLYNOMIAL
-  // APPROXIMATION BELOW IS DUE TO HERMAN WOBUS, A MATHEMATICIAN WHO
-  // WORKED AT THE NAVY WEATHER RESEARCH FACILITY, NORFOLK, VIRGINIA,
-  // BUT WHO IS NOW RETIRED. THE COEFFICIENTS OF THE POLYNOMIAL WERE
-  // CHOSEN TO FIT THE VALUES IN TABLE 94 ON PP. 351-353 OF THE SMITH-
-  // SONIAN METEOROLOGICAL TABLES BY ROLAND LIST (6TH EDITION). THE
-  // APPROXIMATION IS VALID FOR -50 < T < 100C.
-  //
-  //     Baker, Schlatter  17-MAY-1982     Original version.
-
-  const float c0 = +0.99999683e00;
-  const float c1 = -0.90826951e-02;
-  const float c2 = +0.78736169e-04;
-  const float c3 = -0.61117958e-06;
-  const float c4 = +0.43884187e-08;
-  const float c5 = -0.29883885e-10;
-  const float c6 = +0.21874425e-12;
-  const float c7 = -0.17892321e-14;
-  const float c8 = +0.11112018e-16;
-  const float c9 = -0.30994571e-19;
-  const float p = c0 + t * (c1 + t * (c2 + t * (c3 + t * (c4 + t * (c5 + t * (c6 + t * (c7 + t * (c8 + t * (c9)))))))));
-  return 0.61078 / pow(p, 8);
-}
-
-// From https://www.environmentalbiophysics.org/chalk-talk-how-to-calculate-absolute-humidity/
-// H/T to https://esphome.io/cookbook/bme280_environment.html
-// H/T to https://carnotcycle.wordpress.com/2012/08/04/how-to-convert-relative-humidity-to-absolute-humidity/
-float AbsoluteHumidityComponent::vapor_density(float es, float hr, float ta) {
-  // es = saturated vapor pressure (kPa)
-  // hr = relative humidity [0-1]
-  // ta = absolute temperature (K)
-
-  const float ea = hr * es * 1000;   // vapor pressure of the air (Pa)
-  const float mw = 18.01528;         // molar mass of water (g⋅mol⁻¹)
-  const float r = 8.31446261815324;  // molar gas constant (J⋅K⁻¹)
-  return (ea * mw) / (r * ta);
-}
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/absolute_humidity.h

@@ -1,76 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/components/sensor/sensor.h"
-
-namespace esphome {
-namespace absolute_humidity {
-
-/// Enum listing all implemented saturation vapor pressure equations.
-enum SaturationVaporPressureEquation {
-  BUCK,
-  TETENS,
-  WOBUS,
-};
-
-/// This class implements calculation of absolute humidity from temperature and relative humidity.
-class AbsoluteHumidityComponent : public sensor::Sensor, public Component {
- public:
-  AbsoluteHumidityComponent() = default;
-
-  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; }
-  void set_humidity_sensor(sensor::Sensor *humidity_sensor) { this->humidity_sensor_ = humidity_sensor; }
-  void set_equation(SaturationVaporPressureEquation equation) { this->equation_ = equation; }
-
-  void setup() override;
-  void dump_config() override;
-  float get_setup_priority() const override;
-  void loop() override;
-
- protected:
-  void temperature_callback_(float state) {
-    this->next_update_ = true;
-    this->temperature_ = state;
-  }
-  void humidity_callback_(float state) {
-    this->next_update_ = true;
-    this->humidity_ = state;
-  }
-
-  /** Buck equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_buck(float temperature_c);
-  /** Tetens equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_tetens(float temperature_c);
-  /** Wobus equation for saturation vapor pressure in kPa.
-   *
-   * @param temperature_c Air temperature in °C.
-   */
-  static float es_wobus(float temperature_c);
-
-  /** Calculate vapor density (absolute humidity) in g/m³.
-   *
-   * @param es Saturation vapor pressure in kPa.
-   * @param hr Relative humidity 0 to 1.
-   * @param ta Absolute temperature in K.
-   * @param heater_duration The duration in ms that the heater should turn on for when measuring.
-   */
-  static float vapor_density(float es, float hr, float ta);
-
-  sensor::Sensor *temperature_sensor_{nullptr};
-  sensor::Sensor *humidity_sensor_{nullptr};
-
-  bool next_update_{false};
-
-  float temperature_{NAN};
-  float humidity_{NAN};
-  SaturationVaporPressureEquation equation_;
-};
-
-}  // namespace absolute_humidity
-}  // namespace esphome

esphome/components/absolute_humidity/sensor.py

@@ -1,56 +0,0 @@
-import esphome.codegen as cg
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_EQUATION,
-    CONF_HUMIDITY,
-    CONF_TEMPERATURE,
-    ICON_WATER,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_GRAMS_PER_CUBIC_METER,
-)
-
-absolute_humidity_ns = cg.esphome_ns.namespace("absolute_humidity")
-AbsoluteHumidityComponent = absolute_humidity_ns.class_(
-    "AbsoluteHumidityComponent", sensor.Sensor, cg.Component
-)
-
-SaturationVaporPressureEquation = absolute_humidity_ns.enum(
-    "SaturationVaporPressureEquation"
-)
-EQUATION = {
-    "BUCK": SaturationVaporPressureEquation.BUCK,
-    "TETENS": SaturationVaporPressureEquation.TETENS,
-    "WOBUS": SaturationVaporPressureEquation.WOBUS,
-}
-
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(
-        unit_of_measurement=UNIT_GRAMS_PER_CUBIC_METER,
-        icon=ICON_WATER,
-        accuracy_decimals=2,
-        state_class=STATE_CLASS_MEASUREMENT,
-    )
-    .extend(
-        {
-            cv.GenerateID(): cv.declare_id(AbsoluteHumidityComponent),
-            cv.Required(CONF_TEMPERATURE): cv.use_id(sensor.Sensor),
-            cv.Required(CONF_HUMIDITY): cv.use_id(sensor.Sensor),
-            cv.Optional(CONF_EQUATION, default="WOBUS"): cv.enum(EQUATION, upper=True),
-        }
-    )
-    .extend(cv.COMPONENT_SCHEMA)
-)
-
-
-async def to_code(config):
-    var = await sensor.new_sensor(config)
-    await cg.register_component(var, config)
-
-    temperature_sensor = await cg.get_variable(config[CONF_TEMPERATURE])
-    cg.add(var.set_temperature_sensor(temperature_sensor))
-
-    humidity_sensor = await cg.get_variable(config[CONF_HUMIDITY])
-    cg.add(var.set_humidity_sensor(humidity_sensor))
-
-    cg.add(var.set_equation(config[CONF_EQUATION]))

esphome/components/ac_dimmer/ac_dimmer.cpp

@@ -4,7 +4,6 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <cmath>
-#include <numbers>
 
 #ifdef USE_ESP8266
 #include <core_esp8266_waveform.h>
@@ -115,14 +114,13 @@ void IRAM_ATTR HOT AcDimmerDataStore::gpio_intr() {
     // fully off, disable output immediately
     this->gate_pin.digital_write(false);
   } else {
-    auto min_us = this->cycle_time_us * this->min_power / 1000;
     if (this->method == DIM_METHOD_TRAILING) {
       this->enable_time_us = 1;  // cannot be 0
-      // calculate time until disable in µs with integer arithmetic and take into account min_power
-      this->disable_time_us = std::max((uint32_t) 10, this->value * (this->cycle_time_us - min_us) / 65535 + min_us);
+      this->disable_time_us = std::max((uint32_t) 10, this->value * this->cycle_time_us / 65535);
     } else {
       // calculate time until enable in µs: (1.0-value)*cycle_time, but with integer arithmetic
       // also take into account min_power
+      auto min_us = this->cycle_time_us * this->min_power / 1000;
       this->enable_time_us = std::max((uint32_t) 1, ((65535 - this->value) * (this->cycle_time_us - min_us)) / 65535);
 
       if (this->method == DIM_METHOD_LEADING_PULSE) {
@@ -194,17 +192,18 @@ void AcDimmer::setup() {
   setTimer1Callback(&timer_interrupt);
 #endif
 #ifdef USE_ESP32
-  // timer frequency of 1mhz
-  dimmer_timer = timerBegin(1000000);
-  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr);
+  // 80 Divider -> 1 count=1µs
+  dimmer_timer = timerBegin(0, 80, true);
+  timerAttachInterrupt(dimmer_timer, &AcDimmerDataStore::s_timer_intr, true);
   // For ESP32, we can't use dynamic interval calculation because the timerX functions
   // are not callable from ISR (placed in flash storage).
   // Here we just use an interrupt firing every 50 µs.
-  timerAlarm(dimmer_timer, 50, true, 0);
+  timerAlarmWrite(dimmer_timer, 50, true);
+  timerAlarmEnable(dimmer_timer);
 #endif
 }
 void AcDimmer::write_state(float state) {
-  state = std::acos(1 - (2 * state)) / std::numbers::pi;  // RMS power compensation
+  state = std::acos(1 - (2 * state)) / 3.14159;  // RMS power compensation
   auto new_value = static_cast<uint16_t>(roundf(state * 65535));
   if (new_value != 0 && this->store_.value == 0)
     this->store_.init_cycle = this->init_with_half_cycle_;
@@ -214,10 +213,8 @@ void AcDimmer::dump_config() {
   ESP_LOGCONFIG(TAG, "AcDimmer:");
   LOG_PIN("  Output Pin: ", this->gate_pin_);
   LOG_PIN("  Zero-Cross Pin: ", this->zero_cross_pin_);
-  ESP_LOGCONFIG(TAG,
-                "   Min Power: %.1f%%\n"
-                "   Init with half cycle: %s",
-                this->store_.min_power / 10.0f, YESNO(this->init_with_half_cycle_));
+  ESP_LOGCONFIG(TAG, "   Min Power: %.1f%%", this->store_.min_power / 10.0f);
+  ESP_LOGCONFIG(TAG, "   Init with half cycle: %s", YESNO(this->init_with_half_cycle_));
   if (method_ == DIM_METHOD_LEADING_PULSE) {
     ESP_LOGCONFIG(TAG, "   Method: leading pulse");
   } else if (method_ == DIM_METHOD_LEADING) {

esphome/components/ac_dimmer/output.py

@@ -1,8 +1,8 @@
-from esphome import pins
 import esphome.codegen as cg
-from esphome.components import output
 import esphome.config_validation as cv
-from esphome.const import CONF_ID, CONF_METHOD, CONF_MIN_POWER
+from esphome import pins
+from esphome.components import output
+from esphome.const import CONF_ID, CONF_MIN_POWER, CONF_METHOD
 
 CODEOWNERS = ["@glmnet"]
 

esphome/components/adalight/__init__.py

@@ -1,8 +1,8 @@
 import esphome.codegen as cg
-from esphome.components import uart
-from esphome.components.light.effects import register_addressable_effect
-from esphome.components.light.types import AddressableLightEffect
 import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.components.light.types import AddressableLightEffect
+from esphome.components.light.effects import register_addressable_effect
 from esphome.const import CONF_NAME, CONF_UART_ID
 
 DEPENDENCIES = ["uart"]

esphome/components/adc/__init__.py

@@ -1,269 +1 @@
-from esphome import pins
-import esphome.codegen as cg
-from esphome.components.esp32 import get_esp32_variant
-from esphome.components.esp32.const import (
-    VARIANT_ESP32,
-    VARIANT_ESP32C2,
-    VARIANT_ESP32C3,
-    VARIANT_ESP32C5,
-    VARIANT_ESP32C6,
-    VARIANT_ESP32H2,
-    VARIANT_ESP32S2,
-    VARIANT_ESP32S3,
-)
-from esphome.config_helpers import filter_source_files_from_platform
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ANALOG,
-    CONF_INPUT,
-    CONF_NUMBER,
-    PLATFORM_ESP8266,
-    PlatformFramework,
-)
-from esphome.core import CORE
-
 CODEOWNERS = ["@esphome/core"]
-
-adc_ns = cg.esphome_ns.namespace("adc")
-
-
-"""
-From the below patch versions (and 5.2+) ADC_ATTEN_DB_11 is deprecated and replaced with ADC_ATTEN_DB_12.
-4.4.7
-5.0.5
-5.1.3
-5.2+
-"""
-
-ATTENUATION_MODES = {
-    "0db": cg.global_ns.ADC_ATTEN_DB_0,
-    "2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
-    "6db": cg.global_ns.ADC_ATTEN_DB_6,
-    "11db": adc_ns.ADC_ATTEN_DB_12_COMPAT,
-    "12db": adc_ns.ADC_ATTEN_DB_12_COMPAT,
-    "auto": "auto",
-}
-
-sampling_mode = adc_ns.enum("SamplingMode", is_class=True)
-
-SAMPLING_MODES = {
-    "avg": sampling_mode.AVG,
-    "min": sampling_mode.MIN,
-    "max": sampling_mode.MAX,
-}
-
-adc_unit_t = cg.global_ns.enum("adc_unit_t", is_class=True)
-
-adc_channel_t = cg.global_ns.enum("adc_channel_t", is_class=True)
-
-# pin to adc1 channel mapping
-# https://github.com/espressif/esp-idf/blob/v4.4.8/components/driver/include/driver/adc.h
-ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32/include/soc/adc_channel.h
-    VARIANT_ESP32: {
-        36: adc_channel_t.ADC_CHANNEL_0,
-        37: adc_channel_t.ADC_CHANNEL_1,
-        38: adc_channel_t.ADC_CHANNEL_2,
-        39: adc_channel_t.ADC_CHANNEL_3,
-        32: adc_channel_t.ADC_CHANNEL_4,
-        33: adc_channel_t.ADC_CHANNEL_5,
-        34: adc_channel_t.ADC_CHANNEL_6,
-        35: adc_channel_t.ADC_CHANNEL_7,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c2/include/soc/adc_channel.h
-    VARIANT_ESP32C2: {
-        0: adc_channel_t.ADC_CHANNEL_0,
-        1: adc_channel_t.ADC_CHANNEL_1,
-        2: adc_channel_t.ADC_CHANNEL_2,
-        3: adc_channel_t.ADC_CHANNEL_3,
-        4: adc_channel_t.ADC_CHANNEL_4,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c3/include/soc/adc_channel.h
-    VARIANT_ESP32C3: {
-        0: adc_channel_t.ADC_CHANNEL_0,
-        1: adc_channel_t.ADC_CHANNEL_1,
-        2: adc_channel_t.ADC_CHANNEL_2,
-        3: adc_channel_t.ADC_CHANNEL_3,
-        4: adc_channel_t.ADC_CHANNEL_4,
-    },
-    # ESP32-C5 ADC1 pin mapping - based on official ESP-IDF documentation
-    # https://docs.espressif.com/projects/esp-idf/en/latest/esp32c5/api-reference/peripherals/gpio.html
-    VARIANT_ESP32C5: {
-        1: adc_channel_t.ADC_CHANNEL_0,
-        2: adc_channel_t.ADC_CHANNEL_1,
-        3: adc_channel_t.ADC_CHANNEL_2,
-        4: adc_channel_t.ADC_CHANNEL_3,
-        5: adc_channel_t.ADC_CHANNEL_4,
-        6: adc_channel_t.ADC_CHANNEL_5,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c6/include/soc/adc_channel.h
-    VARIANT_ESP32C6: {
-        0: adc_channel_t.ADC_CHANNEL_0,
-        1: adc_channel_t.ADC_CHANNEL_1,
-        2: adc_channel_t.ADC_CHANNEL_2,
-        3: adc_channel_t.ADC_CHANNEL_3,
-        4: adc_channel_t.ADC_CHANNEL_4,
-        5: adc_channel_t.ADC_CHANNEL_5,
-        6: adc_channel_t.ADC_CHANNEL_6,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32h2/include/soc/adc_channel.h
-    VARIANT_ESP32H2: {
-        1: adc_channel_t.ADC_CHANNEL_0,
-        2: adc_channel_t.ADC_CHANNEL_1,
-        3: adc_channel_t.ADC_CHANNEL_2,
-        4: adc_channel_t.ADC_CHANNEL_3,
-        5: adc_channel_t.ADC_CHANNEL_4,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s2/include/soc/adc_channel.h
-    VARIANT_ESP32S2: {
-        1: adc_channel_t.ADC_CHANNEL_0,
-        2: adc_channel_t.ADC_CHANNEL_1,
-        3: adc_channel_t.ADC_CHANNEL_2,
-        4: adc_channel_t.ADC_CHANNEL_3,
-        5: adc_channel_t.ADC_CHANNEL_4,
-        6: adc_channel_t.ADC_CHANNEL_5,
-        7: adc_channel_t.ADC_CHANNEL_6,
-        8: adc_channel_t.ADC_CHANNEL_7,
-        9: adc_channel_t.ADC_CHANNEL_8,
-        10: adc_channel_t.ADC_CHANNEL_9,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s3/include/soc/adc_channel.h
-    VARIANT_ESP32S3: {
-        1: adc_channel_t.ADC_CHANNEL_0,
-        2: adc_channel_t.ADC_CHANNEL_1,
-        3: adc_channel_t.ADC_CHANNEL_2,
-        4: adc_channel_t.ADC_CHANNEL_3,
-        5: adc_channel_t.ADC_CHANNEL_4,
-        6: adc_channel_t.ADC_CHANNEL_5,
-        7: adc_channel_t.ADC_CHANNEL_6,
-        8: adc_channel_t.ADC_CHANNEL_7,
-        9: adc_channel_t.ADC_CHANNEL_8,
-        10: adc_channel_t.ADC_CHANNEL_9,
-    },
-}
-
-# pin to adc2 channel mapping
-# https://github.com/espressif/esp-idf/blob/v4.4.8/components/driver/include/driver/adc.h
-ESP32_VARIANT_ADC2_PIN_TO_CHANNEL = {
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32/include/soc/adc_channel.h
-    VARIANT_ESP32: {
-        4: adc_channel_t.ADC_CHANNEL_0,
-        0: adc_channel_t.ADC_CHANNEL_1,
-        2: adc_channel_t.ADC_CHANNEL_2,
-        15: adc_channel_t.ADC_CHANNEL_3,
-        13: adc_channel_t.ADC_CHANNEL_4,
-        12: adc_channel_t.ADC_CHANNEL_5,
-        14: adc_channel_t.ADC_CHANNEL_6,
-        27: adc_channel_t.ADC_CHANNEL_7,
-        25: adc_channel_t.ADC_CHANNEL_8,
-        26: adc_channel_t.ADC_CHANNEL_9,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c2/include/soc/adc_channel.h
-    VARIANT_ESP32C2: {
-        5: adc_channel_t.ADC_CHANNEL_0,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c3/include/soc/adc_channel.h
-    VARIANT_ESP32C3: {
-        5: adc_channel_t.ADC_CHANNEL_0,
-    },
-    # ESP32-C5 has no ADC2 channels
-    VARIANT_ESP32C5: {},  # no ADC2
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32c6/include/soc/adc_channel.h
-    VARIANT_ESP32C6: {},  # no ADC2
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32h2/include/soc/adc_channel.h
-    VARIANT_ESP32H2: {},  # no ADC2
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s2/include/soc/adc_channel.h
-    VARIANT_ESP32S2: {
-        11: adc_channel_t.ADC_CHANNEL_0,
-        12: adc_channel_t.ADC_CHANNEL_1,
-        13: adc_channel_t.ADC_CHANNEL_2,
-        14: adc_channel_t.ADC_CHANNEL_3,
-        15: adc_channel_t.ADC_CHANNEL_4,
-        16: adc_channel_t.ADC_CHANNEL_5,
-        17: adc_channel_t.ADC_CHANNEL_6,
-        18: adc_channel_t.ADC_CHANNEL_7,
-        19: adc_channel_t.ADC_CHANNEL_8,
-        20: adc_channel_t.ADC_CHANNEL_9,
-    },
-    # https://github.com/espressif/esp-idf/blob/master/components/soc/esp32s3/include/soc/adc_channel.h
-    VARIANT_ESP32S3: {
-        11: adc_channel_t.ADC_CHANNEL_0,
-        12: adc_channel_t.ADC_CHANNEL_1,
-        13: adc_channel_t.ADC_CHANNEL_2,
-        14: adc_channel_t.ADC_CHANNEL_3,
-        15: adc_channel_t.ADC_CHANNEL_4,
-        16: adc_channel_t.ADC_CHANNEL_5,
-        17: adc_channel_t.ADC_CHANNEL_6,
-        18: adc_channel_t.ADC_CHANNEL_7,
-        19: adc_channel_t.ADC_CHANNEL_8,
-        20: adc_channel_t.ADC_CHANNEL_9,
-    },
-}
-
-
-def validate_adc_pin(value):
-    if str(value).upper() == "VCC":
-        if CORE.is_rp2040:
-            return pins.internal_gpio_input_pin_schema(29)
-        return cv.only_on([PLATFORM_ESP8266])("VCC")
-
-    if str(value).upper() == "TEMPERATURE":
-        return cv.only_on_rp2040("TEMPERATURE")
-
-    if CORE.is_esp32:
-        conf = pins.internal_gpio_input_pin_schema(value)
-        value = conf[CONF_NUMBER]
-        variant = get_esp32_variant()
-        if (
-            variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL
-            and variant not in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL
-        ):
-            raise cv.Invalid(f"This ESP32 variant ({variant}) is not supported")
-
-        if (
-            value not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]
-            and value not in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant]
-        ):
-            raise cv.Invalid(f"{variant} doesn't support ADC on this pin")
-
-        return conf
-
-    if CORE.is_esp8266:
-        conf = pins.gpio_pin_schema(
-            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
-        )(value)
-
-        if conf[CONF_NUMBER] != 17:  # A0
-            raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC")
-        return conf
-
-    if CORE.is_rp2040:
-        conf = pins.internal_gpio_input_pin_schema(value)
-        number = conf[CONF_NUMBER]
-        if number not in (26, 27, 28, 29):
-            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC")
-        return conf
-
-    if CORE.is_libretiny:
-        return pins.gpio_pin_schema(
-            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
-        )(value)
-
-    raise NotImplementedError
-
-
-FILTER_SOURCE_FILES = filter_source_files_from_platform(
-    {
-        "adc_sensor_esp32.cpp": {
-            PlatformFramework.ESP32_ARDUINO,
-            PlatformFramework.ESP32_IDF,
-        },
-        "adc_sensor_esp8266.cpp": {PlatformFramework.ESP8266_ARDUINO},
-        "adc_sensor_rp2040.cpp": {PlatformFramework.RP2040_ARDUINO},
-        "adc_sensor_libretiny.cpp": {
-            PlatformFramework.BK72XX_ARDUINO,
-            PlatformFramework.RTL87XX_ARDUINO,
-            PlatformFramework.LN882X_ARDUINO,
-        },
-    }
-)

esphome/components/adc/adc_sensor.cpp

@@ -0,0 +1,231 @@
+#include "adc_sensor.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+#ifdef USE_ESP8266
+#ifdef USE_ADC_SENSOR_VCC
+#include <Esp.h>
+ADC_MODE(ADC_VCC)
+#else
+#include <Arduino.h>
+#endif
+#endif
+
+#ifdef USE_RP2040
+#include <hardware/adc.h>
+#endif
+
+namespace esphome {
+namespace adc {
+
+static const char *const TAG = "adc";
+
+// 13bit for S2, and 12bit for all other esp32 variants
+#ifdef USE_ESP32
+static const adc_bits_width_t ADC_WIDTH_MAX_SOC_BITS = static_cast<adc_bits_width_t>(ADC_WIDTH_MAX - 1);
+
+#ifndef SOC_ADC_RTC_MAX_BITWIDTH
+#if USE_ESP32_VARIANT_ESP32S2
+static const int SOC_ADC_RTC_MAX_BITWIDTH = 13;
+#else
+static const int SOC_ADC_RTC_MAX_BITWIDTH = 12;
+#endif
+#endif
+
+static const int ADC_MAX = (1 << SOC_ADC_RTC_MAX_BITWIDTH) - 1;    // 4095 (12 bit) or 8191 (13 bit)
+static const int ADC_HALF = (1 << SOC_ADC_RTC_MAX_BITWIDTH) >> 1;  // 2048 (12 bit) or 4096 (13 bit)
+#endif
+
+#ifdef USE_RP2040
+extern "C"
+#endif
+    void
+    ADCSensor::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up ADC '%s'...", this->get_name().c_str());
+#if !defined(USE_ADC_SENSOR_VCC) && !defined(USE_RP2040)
+  pin_->setup();
+#endif
+
+#ifdef USE_ESP32
+  adc1_config_width(ADC_WIDTH_MAX_SOC_BITS);
+  if (!autorange_) {
+    adc1_config_channel_atten(channel_, attenuation_);
+  }
+
+  // load characteristics for each attenuation
+  for (int i = 0; i < (int) ADC_ATTEN_MAX; i++) {
+    auto cal_value = esp_adc_cal_characterize(ADC_UNIT_1, (adc_atten_t) i, ADC_WIDTH_MAX_SOC_BITS,
+                                              1100,  // default vref
+                                              &cal_characteristics_[i]);
+    switch (cal_value) {
+      case ESP_ADC_CAL_VAL_EFUSE_VREF:
+        ESP_LOGV(TAG, "Using eFuse Vref for calibration");
+        break;
+      case ESP_ADC_CAL_VAL_EFUSE_TP:
+        ESP_LOGV(TAG, "Using two-point eFuse Vref for calibration");
+        break;
+      case ESP_ADC_CAL_VAL_DEFAULT_VREF:
+      default:
+        break;
+    }
+  }
+
+#endif  // USE_ESP32
+
+#ifdef USE_RP2040
+  static bool initialized = false;
+  if (!initialized) {
+    adc_init();
+    initialized = true;
+  }
+#endif
+
+  ESP_LOGCONFIG(TAG, "ADC '%s' setup finished!", this->get_name().c_str());
+}
+
+void ADCSensor::dump_config() {
+  LOG_SENSOR("", "ADC Sensor", this);
+#ifdef USE_ESP8266
+#ifdef USE_ADC_SENSOR_VCC
+  ESP_LOGCONFIG(TAG, "  Pin: VCC");
+#else
+  LOG_PIN("  Pin: ", pin_);
+#endif
+#endif  // USE_ESP8266
+
+#ifdef USE_ESP32
+  LOG_PIN("  Pin: ", pin_);
+  if (autorange_) {
+    ESP_LOGCONFIG(TAG, " Attenuation: auto");
+  } else {
+    switch (this->attenuation_) {
+      case ADC_ATTEN_DB_0:
+        ESP_LOGCONFIG(TAG, " Attenuation: 0db");
+        break;
+      case ADC_ATTEN_DB_2_5:
+        ESP_LOGCONFIG(TAG, " Attenuation: 2.5db");
+        break;
+      case ADC_ATTEN_DB_6:
+        ESP_LOGCONFIG(TAG, " Attenuation: 6db");
+        break;
+      case ADC_ATTEN_DB_11:
+        ESP_LOGCONFIG(TAG, " Attenuation: 11db");
+        break;
+      default:  // This is to satisfy the unused ADC_ATTEN_MAX
+        break;
+    }
+  }
+#endif  // USE_ESP32
+#ifdef USE_RP2040
+  if (this->is_temperature_) {
+    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
+  } else {
+    LOG_PIN("  Pin: ", pin_);
+  }
+#endif
+  LOG_UPDATE_INTERVAL(this);
+}
+
+float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
+void ADCSensor::update() {
+  float value_v = this->sample();
+  ESP_LOGV(TAG, "'%s': Got voltage=%.4fV", this->get_name().c_str(), value_v);
+  this->publish_state(value_v);
+}
+
+#ifdef USE_ESP8266
+float ADCSensor::sample() {
+#ifdef USE_ADC_SENSOR_VCC
+  int raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
+#else
+  int raw = analogRead(this->pin_->get_pin());  // NOLINT
+#endif
+  if (output_raw_) {
+    return raw;
+  }
+  return raw / 1024.0f;
+}
+#endif
+
+#ifdef USE_ESP32
+float ADCSensor::sample() {
+  if (!autorange_) {
+    int raw = adc1_get_raw(channel_);
+    if (raw == -1) {
+      return NAN;
+    }
+    if (output_raw_) {
+      return raw;
+    }
+    uint32_t mv = esp_adc_cal_raw_to_voltage(raw, &cal_characteristics_[(int) attenuation_]);
+    return mv / 1000.0f;
+  }
+
+  int raw11, raw6 = ADC_MAX, raw2 = ADC_MAX, raw0 = ADC_MAX;
+  adc1_config_channel_atten(channel_, ADC_ATTEN_DB_11);
+  raw11 = adc1_get_raw(channel_);
+  if (raw11 < ADC_MAX) {
+    adc1_config_channel_atten(channel_, ADC_ATTEN_DB_6);
+    raw6 = adc1_get_raw(channel_);
+    if (raw6 < ADC_MAX) {
+      adc1_config_channel_atten(channel_, ADC_ATTEN_DB_2_5);
+      raw2 = adc1_get_raw(channel_);
+      if (raw2 < ADC_MAX) {
+        adc1_config_channel_atten(channel_, ADC_ATTEN_DB_0);
+        raw0 = adc1_get_raw(channel_);
+      }
+    }
+  }
+
+  if (raw0 == -1 || raw2 == -1 || raw6 == -1 || raw11 == -1) {
+    return NAN;
+  }
+
+  uint32_t mv11 = esp_adc_cal_raw_to_voltage(raw11, &cal_characteristics_[(int) ADC_ATTEN_DB_11]);
+  uint32_t mv6 = esp_adc_cal_raw_to_voltage(raw6, &cal_characteristics_[(int) ADC_ATTEN_DB_6]);
+  uint32_t mv2 = esp_adc_cal_raw_to_voltage(raw2, &cal_characteristics_[(int) ADC_ATTEN_DB_2_5]);
+  uint32_t mv0 = esp_adc_cal_raw_to_voltage(raw0, &cal_characteristics_[(int) ADC_ATTEN_DB_0]);
+
+  // Contribution of each value, in range 0-2048 (12 bit ADC) or 0-4096 (13 bit ADC)
+  uint32_t c11 = std::min(raw11, ADC_HALF);
+  uint32_t c6 = ADC_HALF - std::abs(raw6 - ADC_HALF);
+  uint32_t c2 = ADC_HALF - std::abs(raw2 - ADC_HALF);
+  uint32_t c0 = std::min(ADC_MAX - raw0, ADC_HALF);
+  // max theoretical csum value is 4096*4 = 16384
+  uint32_t csum = c11 + c6 + c2 + c0;
+
+  // each mv is max 3900; so max value is 3900*4096*4, fits in unsigned32
+  uint32_t mv_scaled = (mv11 * c11) + (mv6 * c6) + (mv2 * c2) + (mv0 * c0);
+  return mv_scaled / (float) (csum * 1000U);
+}
+#endif  // USE_ESP32
+
+#ifdef USE_RP2040
+float ADCSensor::sample() {
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(true);
+    delay(1);
+    adc_select_input(4);
+  } else {
+    uint8_t pin = this->pin_->get_pin();
+    adc_gpio_init(pin);
+    adc_select_input(pin - 26);
+  }
+
+  int raw = adc_read();
+  if (this->is_temperature_) {
+    adc_set_temp_sensor_enabled(false);
+  }
+  if (output_raw_) {
+    return raw;
+  }
+  return raw * 3.3f / 4096.0f;
+}
+#endif
+
+#ifdef USE_ESP8266
+std::string ADCSensor::unique_id() { return get_mac_address() + "-adc"; }
+#endif
+
+}  // namespace adc
+}  // namespace esphome

esphome/components/adc/adc_sensor.h

@@ -1,156 +1,61 @@
 #pragma once
 
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/defines.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/voltage_sampler/voltage_sampler.h"
-#include "esphome/core/component.h"
-#include "esphome/core/defines.h"
-#include "esphome/core/hal.h"
 
 #ifdef USE_ESP32
-#include "esp_adc/adc_cali.h"
-#include "esp_adc/adc_cali_scheme.h"
-#include "esp_adc/adc_oneshot.h"
-#include "hal/adc_types.h"  // This defines ADC_CHANNEL_MAX
-#endif                      // USE_ESP32
+#include "driver/adc.h"
+#include <esp_adc_cal.h>
+#endif
 
 namespace esphome {
 namespace adc {
 
-#ifdef USE_ESP32
-// clang-format off
-#if (ESP_IDF_VERSION_MAJOR == 5 && \
-     ((ESP_IDF_VERSION_MINOR == 0 && ESP_IDF_VERSION_PATCH >= 5) || \
-      (ESP_IDF_VERSION_MINOR == 1 && ESP_IDF_VERSION_PATCH >= 3) || \
-      (ESP_IDF_VERSION_MINOR >= 2)) \
-    )
-// clang-format on
-static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_12;
-#else
-static const adc_atten_t ADC_ATTEN_DB_12_COMPAT = ADC_ATTEN_DB_11;
-#endif
-#endif  // USE_ESP32
-
-enum class SamplingMode : uint8_t {
-  AVG = 0,
-  MIN = 1,
-  MAX = 2,
-};
-
-const LogString *sampling_mode_to_str(SamplingMode mode);
-
-class Aggregator {
- public:
-  Aggregator(SamplingMode mode);
-  void add_sample(uint32_t value);
-  uint32_t aggregate();
-
- protected:
-  uint32_t aggr_{0};
-  uint32_t samples_{0};
-  SamplingMode mode_{SamplingMode::AVG};
-};
-
 class ADCSensor : public sensor::Sensor, public PollingComponent, public voltage_sampler::VoltageSampler {
  public:
-  /// Update the sensor's state by reading the current ADC value.
-  /// This method is called periodically based on the update interval.
+#ifdef USE_ESP32
+  /// Set the attenuation for this pin. Only available on the ESP32.
+  void set_attenuation(adc_atten_t attenuation) { attenuation_ = attenuation; }
+  void set_channel(adc1_channel_t channel) { channel_ = channel; }
+  void set_autorange(bool autorange) { autorange_ = autorange; }
+#endif
+
+  /// Update adc values.
   void update() override;
-
-  /// Set up the ADC sensor by initializing hardware and calibration parameters.
-  /// This method is called once during device initialization.
+  /// Setup ADc
   void setup() override;
-
-  /// Output the configuration details of the ADC sensor for debugging purposes.
-  /// This method is called during the ESPHome setup process to log the configuration.
   void dump_config() override;
-
-  /// Return the setup priority for this component.
-  /// Components with higher priority are initialized earlier during setup.
-  /// @return A float representing the setup priority.
+  /// `HARDWARE_LATE` setup priority.
   float get_setup_priority() const override;
-
-  /// Set the GPIO pin to be used by the ADC sensor.
-  /// @param pin Pointer to an InternalGPIOPin representing the ADC input pin.
   void set_pin(InternalGPIOPin *pin) { this->pin_ = pin; }
-
-  /// Enable or disable the output of raw ADC values (unprocessed data).
-  /// @param output_raw Boolean indicating whether to output raw ADC values (true) or processed values (false).
-  void set_output_raw(bool output_raw) { this->output_raw_ = output_raw; }
-
-  /// Set the number of samples to be taken for ADC readings to improve accuracy.
-  /// A higher sample count reduces noise but increases the reading time.
-  /// @param sample_count The number of samples (e.g., 1, 4, 8).
-  void set_sample_count(uint8_t sample_count);
-
-  /// Set the sampling mode for how multiple ADC samples are combined into a single measurement.
-  ///
-  /// When multiple samples are taken (controlled by set_sample_count), they can be combined
-  /// in one of three ways:
-  ///   - SamplingMode::AVG: Compute the average (default)
-  ///   - SamplingMode::MIN: Use the lowest sample value
-  ///   - SamplingMode::MAX: Use the highest sample value
-  /// @param sampling_mode The desired sampling mode to use for aggregating ADC samples.
-  void set_sampling_mode(SamplingMode sampling_mode);
-
-  /// Perform a single ADC sampling operation and return the measured value.
-  /// This function handles raw readings, calibration, and averaging as needed.
-  /// @return The sampled value as a float.
+  void set_output_raw(bool output_raw) { output_raw_ = output_raw; }
   float sample() override;
 
-#ifdef USE_ESP32
-  /// Set the ADC attenuation level to adjust the input voltage range.
-  /// This determines how the ADC interprets input voltages, allowing for greater precision
-  /// or the ability to measure higher voltages depending on the chosen attenuation level.
-  /// @param attenuation The desired ADC attenuation level (e.g., ADC_ATTEN_DB_0, ADC_ATTEN_DB_11).
-  void set_attenuation(adc_atten_t attenuation) { this->attenuation_ = attenuation; }
-
-  /// Configure the ADC to use a specific channel on a specific ADC unit.
-  /// This sets the channel for single-shot or continuous ADC measurements.
-  /// @param unit The ADC unit to use (ADC_UNIT_1 or ADC_UNIT_2).
-  /// @param channel The ADC channel to configure, such as ADC_CHANNEL_0, ADC_CHANNEL_3, etc.
-  void set_channel(adc_unit_t unit, adc_channel_t channel) {
-    this->adc_unit_ = unit;
-    this->channel_ = channel;
-  }
-
-  /// Set whether autoranging should be enabled for the ADC.
-  /// Autoranging automatically adjusts the attenuation level to handle a wide range of input voltages.
-  /// @param autorange Boolean indicating whether to enable autoranging.
-  void set_autorange(bool autorange) { this->autorange_ = autorange; }
-#endif  // USE_ESP32
+#ifdef USE_ESP8266
+  std::string unique_id() override;
+#endif
 
 #ifdef USE_RP2040
-  void set_is_temperature() { this->is_temperature_ = true; }
-#endif  // USE_RP2040
+  void set_is_temperature() { is_temperature_ = true; }
+#endif
 
  protected:
-  uint8_t sample_count_{1};
-  bool output_raw_{false};
   InternalGPIOPin *pin_;
-  SamplingMode sampling_mode_{SamplingMode::AVG};
-
-#ifdef USE_ESP32
-  float sample_autorange_();
-  float sample_fixed_attenuation_();
-  bool autorange_{false};
-  adc_oneshot_unit_handle_t adc_handle_{nullptr};
-  adc_cali_handle_t calibration_handle_{nullptr};
-  adc_atten_t attenuation_{ADC_ATTEN_DB_0};
-  adc_channel_t channel_;
-  adc_unit_t adc_unit_;
-  struct SetupFlags {
-    uint8_t init_complete : 1;
-    uint8_t config_complete : 1;
-    uint8_t handle_init_complete : 1;
-    uint8_t calibration_complete : 1;
-    uint8_t reserved : 4;
-  } setup_flags_{};
-  static adc_oneshot_unit_handle_t shared_adc_handles[2];
-#endif  // USE_ESP32
+  bool output_raw_{false};
 
 #ifdef USE_RP2040
   bool is_temperature_{false};
-#endif  // USE_RP2040
+#endif
+
+#ifdef USE_ESP32
+  adc_atten_t attenuation_{ADC_ATTEN_DB_0};
+  adc1_channel_t channel_{};
+  bool autorange_{false};
+  esp_adc_cal_characteristics_t cal_characteristics_[(int) ADC_ATTEN_MAX] = {};
+#endif
 };
 
 }  // namespace adc

esphome/components/adc/adc_sensor_common.cpp

@@ -1,79 +0,0 @@
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.common";
-
-const LogString *sampling_mode_to_str(SamplingMode mode) {
-  switch (mode) {
-    case SamplingMode::AVG:
-      return LOG_STR("average");
-    case SamplingMode::MIN:
-      return LOG_STR("minimum");
-    case SamplingMode::MAX:
-      return LOG_STR("maximum");
-  }
-  return LOG_STR("unknown");
-}
-
-Aggregator::Aggregator(SamplingMode mode) {
-  this->mode_ = mode;
-  // set to max uint if mode is "min"
-  if (mode == SamplingMode::MIN) {
-    this->aggr_ = UINT32_MAX;
-  }
-}
-
-void Aggregator::add_sample(uint32_t value) {
-  this->samples_ += 1;
-
-  switch (this->mode_) {
-    case SamplingMode::AVG:
-      this->aggr_ += value;
-      break;
-
-    case SamplingMode::MIN:
-      if (value < this->aggr_) {
-        this->aggr_ = value;
-      }
-      break;
-
-    case SamplingMode::MAX:
-      if (value > this->aggr_) {
-        this->aggr_ = value;
-      }
-  }
-}
-
-uint32_t Aggregator::aggregate() {
-  if (this->mode_ == SamplingMode::AVG) {
-    if (this->samples_ == 0) {
-      return this->aggr_;
-    }
-
-    return (this->aggr_ + (this->samples_ >> 1)) / this->samples_;  // NOLINT(clang-analyzer-core.DivideZero)
-  }
-
-  return this->aggr_;
-}
-
-void ADCSensor::update() {
-  float value_v = this->sample();
-  ESP_LOGV(TAG, "'%s': Voltage=%.4fV", this->get_name().c_str(), value_v);
-  this->publish_state(value_v);
-}
-
-void ADCSensor::set_sample_count(uint8_t sample_count) {
-  if (sample_count != 0) {
-    this->sample_count_ = sample_count;
-  }
-}
-
-void ADCSensor::set_sampling_mode(SamplingMode sampling_mode) { this->sampling_mode_ = sampling_mode; }
-
-float ADCSensor::get_setup_priority() const { return setup_priority::DATA; }
-
-}  // namespace adc
-}  // namespace esphome

esphome/components/adc/adc_sensor_esp32.cpp

@@ -1,346 +0,0 @@
-#ifdef USE_ESP32
-
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.esp32";
-
-adc_oneshot_unit_handle_t ADCSensor::shared_adc_handles[2] = {nullptr, nullptr};
-
-const LogString *attenuation_to_str(adc_atten_t attenuation) {
-  switch (attenuation) {
-    case ADC_ATTEN_DB_0:
-      return LOG_STR("0 dB");
-    case ADC_ATTEN_DB_2_5:
-      return LOG_STR("2.5 dB");
-    case ADC_ATTEN_DB_6:
-      return LOG_STR("6 dB");
-    case ADC_ATTEN_DB_12_COMPAT:
-      return LOG_STR("12 dB");
-    default:
-      return LOG_STR("Unknown Attenuation");
-  }
-}
-
-const LogString *adc_unit_to_str(adc_unit_t unit) {
-  switch (unit) {
-    case ADC_UNIT_1:
-      return LOG_STR("ADC1");
-    case ADC_UNIT_2:
-      return LOG_STR("ADC2");
-    default:
-      return LOG_STR("Unknown ADC Unit");
-  }
-}
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
-  // Check if another sensor already initialized this ADC unit
-  if (ADCSensor::shared_adc_handles[this->adc_unit_] == nullptr) {
-    adc_oneshot_unit_init_cfg_t init_config = {};  // Zero initialize
-    init_config.unit_id = this->adc_unit_;
-    init_config.ulp_mode = ADC_ULP_MODE_DISABLE;
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || USE_ESP32_VARIANT_ESP32H2
-    init_config.clk_src = ADC_DIGI_CLK_SRC_DEFAULT;
-#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 ||
-        // USE_ESP32_VARIANT_ESP32H2
-    esp_err_t err = adc_oneshot_new_unit(&init_config, &ADCSensor::shared_adc_handles[this->adc_unit_]);
-    if (err != ESP_OK) {
-      ESP_LOGE(TAG, "Error initializing %s: %d", LOG_STR_ARG(adc_unit_to_str(this->adc_unit_)), err);
-      this->mark_failed();
-      return;
-    }
-  }
-  this->adc_handle_ = ADCSensor::shared_adc_handles[this->adc_unit_];
-
-  this->setup_flags_.handle_init_complete = true;
-
-  adc_oneshot_chan_cfg_t config = {
-      .atten = this->attenuation_,
-      .bitwidth = ADC_BITWIDTH_DEFAULT,
-  };
-  esp_err_t err = adc_oneshot_config_channel(this->adc_handle_, this->channel_, &config);
-  if (err != ESP_OK) {
-    ESP_LOGE(TAG, "Error configuring channel: %d", err);
-    this->mark_failed();
-    return;
-  }
-  this->setup_flags_.config_complete = true;
-
-  // Initialize ADC calibration
-  if (this->calibration_handle_ == nullptr) {
-    adc_cali_handle_t handle = nullptr;
-    esp_err_t err;
-
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-    // RISC-V variants and S3 use curve fitting calibration
-    adc_cali_curve_fitting_config_t cali_config = {};  // Zero initialize first
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-    cali_config.chan = this->channel_;
-#endif  // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-    cali_config.unit_id = this->adc_unit_;
-    cali_config.atten = this->attenuation_;
-    cali_config.bitwidth = ADC_BITWIDTH_DEFAULT;
-
-    err = adc_cali_create_scheme_curve_fitting(&cali_config, &handle);
-    if (err == ESP_OK) {
-      this->calibration_handle_ = handle;
-      this->setup_flags_.calibration_complete = true;
-      ESP_LOGV(TAG, "Using curve fitting calibration");
-    } else {
-      ESP_LOGW(TAG, "Curve fitting calibration failed with error %d, will use uncalibrated readings", err);
-      this->setup_flags_.calibration_complete = false;
-    }
-#else  // Other ESP32 variants use line fitting calibration
-    adc_cali_line_fitting_config_t cali_config = {
-      .unit_id = this->adc_unit_,
-      .atten = this->attenuation_,
-      .bitwidth = ADC_BITWIDTH_DEFAULT,
-#if !defined(USE_ESP32_VARIANT_ESP32S2)
-      .default_vref = 1100,  // Default reference voltage in mV
-#endif  // !defined(USE_ESP32_VARIANT_ESP32S2)
-    };
-    err = adc_cali_create_scheme_line_fitting(&cali_config, &handle);
-    if (err == ESP_OK) {
-      this->calibration_handle_ = handle;
-      this->setup_flags_.calibration_complete = true;
-      ESP_LOGV(TAG, "Using line fitting calibration");
-    } else {
-      ESP_LOGW(TAG, "Line fitting calibration failed with error %d, will use uncalibrated readings", err);
-      this->setup_flags_.calibration_complete = false;
-    }
-#endif  // USE_ESP32_VARIANT_ESP32C3 || ESP32C5 || ESP32C6 || ESP32S3 || ESP32H2
-  }
-
-  this->setup_flags_.init_complete = true;
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-  LOG_PIN("  Pin: ", this->pin_);
-  ESP_LOGCONFIG(TAG,
-                "  Channel:       %d\n"
-                "  Unit:          %s\n"
-                "  Attenuation:   %s\n"
-                "  Samples:       %i\n"
-                "  Sampling mode: %s",
-                this->channel_, LOG_STR_ARG(adc_unit_to_str(this->adc_unit_)),
-                this->autorange_ ? "Auto" : LOG_STR_ARG(attenuation_to_str(this->attenuation_)), this->sample_count_,
-                LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-
-  ESP_LOGCONFIG(
-      TAG,
-      "  Setup Status:\n"
-      "    Handle Init:  %s\n"
-      "    Config:       %s\n"
-      "    Calibration:  %s\n"
-      "    Overall Init: %s",
-      this->setup_flags_.handle_init_complete ? "OK" : "FAILED", this->setup_flags_.config_complete ? "OK" : "FAILED",
-      this->setup_flags_.calibration_complete ? "OK" : "FAILED", this->setup_flags_.init_complete ? "OK" : "FAILED");
-
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  if (this->autorange_) {
-    return this->sample_autorange_();
-  } else {
-    return this->sample_fixed_attenuation_();
-  }
-}
-
-float ADCSensor::sample_fixed_attenuation_() {
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    int raw;
-    esp_err_t err = adc_oneshot_read(this->adc_handle_, this->channel_, &raw);
-
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "ADC read failed with error %d", err);
-      continue;
-    }
-
-    if (raw == -1) {
-      ESP_LOGW(TAG, "Invalid ADC reading");
-      continue;
-    }
-
-    aggr.add_sample(raw);
-  }
-
-  uint32_t final_value = aggr.aggregate();
-
-  if (this->output_raw_) {
-    return final_value;
-  }
-
-  if (this->calibration_handle_ != nullptr) {
-    int voltage_mv;
-    esp_err_t err = adc_cali_raw_to_voltage(this->calibration_handle_, final_value, &voltage_mv);
-    if (err == ESP_OK) {
-      return voltage_mv / 1000.0f;
-    } else {
-      ESP_LOGW(TAG, "ADC calibration conversion failed with error %d, disabling calibration", err);
-      if (this->calibration_handle_ != nullptr) {
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-        adc_cali_delete_scheme_curve_fitting(this->calibration_handle_);
-#else   // Other ESP32 variants use line fitting calibration
-        adc_cali_delete_scheme_line_fitting(this->calibration_handle_);
-#endif  // USE_ESP32_VARIANT_ESP32C3 || ESP32C5 || ESP32C6 || ESP32S3 || ESP32H2
-        this->calibration_handle_ = nullptr;
-      }
-    }
-  }
-
-  return final_value * 3.3f / 4095.0f;
-}
-
-float ADCSensor::sample_autorange_() {
-  // Auto-range mode
-  auto read_atten = [this](adc_atten_t atten) -> std::pair<int, float> {
-    // First reconfigure the attenuation for this reading
-    adc_oneshot_chan_cfg_t config = {
-        .atten = atten,
-        .bitwidth = ADC_BITWIDTH_DEFAULT,
-    };
-
-    esp_err_t err = adc_oneshot_config_channel(this->adc_handle_, this->channel_, &config);
-
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "Error configuring ADC channel for autorange: %d", err);
-      return {-1, 0.0f};
-    }
-
-    // Need to recalibrate for the new attenuation
-    if (this->calibration_handle_ != nullptr) {
-      // Delete old calibration handle
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-      adc_cali_delete_scheme_curve_fitting(this->calibration_handle_);
-#else
-      adc_cali_delete_scheme_line_fitting(this->calibration_handle_);
-#endif
-      this->calibration_handle_ = nullptr;
-    }
-
-    // Create new calibration handle for this attenuation
-    adc_cali_handle_t handle = nullptr;
-
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-    adc_cali_curve_fitting_config_t cali_config = {};
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 3, 0)
-    cali_config.chan = this->channel_;
-#endif
-    cali_config.unit_id = this->adc_unit_;
-    cali_config.atten = atten;
-    cali_config.bitwidth = ADC_BITWIDTH_DEFAULT;
-
-    err = adc_cali_create_scheme_curve_fitting(&cali_config, &handle);
-#else
-    adc_cali_line_fitting_config_t cali_config = {
-      .unit_id = this->adc_unit_,
-      .atten = atten,
-      .bitwidth = ADC_BITWIDTH_DEFAULT,
-#if !defined(USE_ESP32_VARIANT_ESP32S2)
-      .default_vref = 1100,
-#endif
-    };
-    err = adc_cali_create_scheme_line_fitting(&cali_config, &handle);
-#endif
-
-    int raw;
-    err = adc_oneshot_read(this->adc_handle_, this->channel_, &raw);
-
-    if (err != ESP_OK) {
-      ESP_LOGW(TAG, "ADC read failed in autorange with error %d", err);
-      if (handle != nullptr) {
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-        adc_cali_delete_scheme_curve_fitting(handle);
-#else
-        adc_cali_delete_scheme_line_fitting(handle);
-#endif
-      }
-      return {-1, 0.0f};
-    }
-
-    float voltage = 0.0f;
-    if (handle != nullptr) {
-      int voltage_mv;
-      err = adc_cali_raw_to_voltage(handle, raw, &voltage_mv);
-      if (err == ESP_OK) {
-        voltage = voltage_mv / 1000.0f;
-      } else {
-        voltage = raw * 3.3f / 4095.0f;
-      }
-      // Clean up calibration handle
-#if USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C5 || USE_ESP32_VARIANT_ESP32C6 || \
-    USE_ESP32_VARIANT_ESP32S3 || USE_ESP32_VARIANT_ESP32H2
-      adc_cali_delete_scheme_curve_fitting(handle);
-#else
-      adc_cali_delete_scheme_line_fitting(handle);
-#endif
-    } else {
-      voltage = raw * 3.3f / 4095.0f;
-    }
-
-    return {raw, voltage};
-  };
-
-  auto [raw12, mv12] = read_atten(ADC_ATTEN_DB_12);
-  if (raw12 == -1) {
-    ESP_LOGE(TAG, "Failed to read ADC in autorange mode");
-    return NAN;
-  }
-
-  int raw6 = 4095, raw2 = 4095, raw0 = 4095;
-  float mv6 = 0, mv2 = 0, mv0 = 0;
-
-  if (raw12 < 4095) {
-    auto [raw6_val, mv6_val] = read_atten(ADC_ATTEN_DB_6);
-    raw6 = raw6_val;
-    mv6 = mv6_val;
-
-    if (raw6 < 4095 && raw6 != -1) {
-      auto [raw2_val, mv2_val] = read_atten(ADC_ATTEN_DB_2_5);
-      raw2 = raw2_val;
-      mv2 = mv2_val;
-
-      if (raw2 < 4095 && raw2 != -1) {
-        auto [raw0_val, mv0_val] = read_atten(ADC_ATTEN_DB_0);
-        raw0 = raw0_val;
-        mv0 = mv0_val;
-      }
-    }
-  }
-
-  if (raw0 == -1 || raw2 == -1 || raw6 == -1 || raw12 == -1) {
-    return NAN;
-  }
-
-  const int adc_half = 2048;
-  uint32_t c12 = std::min(raw12, adc_half);
-  uint32_t c6 = adc_half - std::abs(raw6 - adc_half);
-  uint32_t c2 = adc_half - std::abs(raw2 - adc_half);
-  uint32_t c0 = std::min(4095 - raw0, adc_half);
-  uint32_t csum = c12 + c6 + c2 + c0;
-
-  if (csum == 0) {
-    ESP_LOGE(TAG, "Invalid weight sum in autorange calculation");
-    return NAN;
-  }
-
-  return (mv12 * c12 + mv6 * c6 + mv2 * c2 + mv0 * c0) / csum;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_ESP32

esphome/components/adc/adc_sensor_esp8266.cpp

@@ -1,62 +0,0 @@
-#ifdef USE_ESP8266
-
-#include "adc_sensor.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-#ifdef USE_ADC_SENSOR_VCC
-#include <Esp.h>
-ADC_MODE(ADC_VCC)
-#else
-#include <Arduino.h>
-#endif  // USE_ADC_SENSOR_VCC
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.esp8266";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
-  this->pin_->setup();
-#endif
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-#ifdef USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
-  LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG,
-                "  Samples: %i\n"
-                "  Sampling mode: %s",
-                this->sample_count_, LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    uint32_t raw = 0;
-#ifdef USE_ADC_SENSOR_VCC
-    raw = ESP.getVcc();  // NOLINT(readability-static-accessed-through-instance)
-#else
-    raw = analogRead(this->pin_->get_pin());  // NOLINT
-#endif  // USE_ADC_SENSOR_VCC
-    aggr.add_sample(raw);
-  }
-
-  if (this->output_raw_) {
-    return aggr.aggregate();
-  }
-  return aggr.aggregate() / 1024.0f;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_ESP8266

esphome/components/adc/adc_sensor_libretiny.cpp

@@ -1,55 +0,0 @@
-#ifdef USE_LIBRETINY
-
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.libretiny";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
-#ifndef USE_ADC_SENSOR_VCC
-  this->pin_->setup();
-#endif  // !USE_ADC_SENSOR_VCC
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-#ifdef USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else   // USE_ADC_SENSOR_VCC
-  LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  ESP_LOGCONFIG(TAG,
-                "  Samples: %i\n"
-                "  Sampling mode: %s",
-                this->sample_count_, LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  uint32_t raw = 0;
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  if (this->output_raw_) {
-    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-      raw = analogRead(this->pin_->get_pin());  // NOLINT
-      aggr.add_sample(raw);
-    }
-    return aggr.aggregate();
-  }
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    raw = analogReadVoltage(this->pin_->get_pin());  // NOLINT
-    aggr.add_sample(raw);
-  }
-
-  return aggr.aggregate() / 1000.0f;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_LIBRETINY

esphome/components/adc/adc_sensor_rp2040.cpp

@@ -1,98 +0,0 @@
-#ifdef USE_RP2040
-
-#include "adc_sensor.h"
-#include "esphome/core/log.h"
-
-#ifdef CYW43_USES_VSYS_PIN
-#include "pico/cyw43_arch.h"
-#endif  // CYW43_USES_VSYS_PIN
-#include <hardware/adc.h>
-
-namespace esphome {
-namespace adc {
-
-static const char *const TAG = "adc.rp2040";
-
-void ADCSensor::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup for '%s'", this->get_name().c_str());
-  static bool initialized = false;
-  if (!initialized) {
-    adc_init();
-    initialized = true;
-  }
-}
-
-void ADCSensor::dump_config() {
-  LOG_SENSOR("", "ADC Sensor", this);
-  if (this->is_temperature_) {
-    ESP_LOGCONFIG(TAG, "  Pin: Temperature");
-  } else {
-#ifdef USE_ADC_SENSOR_VCC
-    ESP_LOGCONFIG(TAG, "  Pin: VCC");
-#else
-    LOG_PIN("  Pin: ", this->pin_);
-#endif  // USE_ADC_SENSOR_VCC
-  }
-  ESP_LOGCONFIG(TAG,
-                "  Samples: %i\n"
-                "  Sampling mode: %s",
-                this->sample_count_, LOG_STR_ARG(sampling_mode_to_str(this->sampling_mode_)));
-  LOG_UPDATE_INTERVAL(this);
-}
-
-float ADCSensor::sample() {
-  uint32_t raw = 0;
-  auto aggr = Aggregator(this->sampling_mode_);
-
-  if (this->is_temperature_) {
-    adc_set_temp_sensor_enabled(true);
-    delay(1);
-    adc_select_input(4);
-
-    for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-      raw = adc_read();
-      aggr.add_sample(raw);
-    }
-    adc_set_temp_sensor_enabled(false);
-    if (this->output_raw_) {
-      return aggr.aggregate();
-    }
-    return aggr.aggregate() * 3.3f / 4096.0f;
-  }
-
-  uint8_t pin = this->pin_->get_pin();
-#ifdef CYW43_USES_VSYS_PIN
-  if (pin == PICO_VSYS_PIN) {
-    // Measuring VSYS on Raspberry Pico W needs to be wrapped with
-    // `cyw43_thread_enter()`/`cyw43_thread_exit()` as discussed in
-    // https://github.com/raspberrypi/pico-sdk/issues/1222, since Wifi chip and
-    // VSYS ADC both share GPIO29
-    cyw43_thread_enter();
-  }
-#endif  // CYW43_USES_VSYS_PIN
-
-  adc_gpio_init(pin);
-  adc_select_input(pin - 26);
-
-  for (uint8_t sample = 0; sample < this->sample_count_; sample++) {
-    raw = adc_read();
-    aggr.add_sample(raw);
-  }
-
-#ifdef CYW43_USES_VSYS_PIN
-  if (pin == PICO_VSYS_PIN) {
-    cyw43_thread_exit();
-  }
-#endif  // CYW43_USES_VSYS_PIN
-
-  if (this->output_raw_) {
-    return aggr.aggregate();
-  }
-  float coeff = pin == PICO_VSYS_PIN ? 3.0f : 1.0f;
-  return aggr.aggregate() * 3.3f / 4096.0f * coeff;
-}
-
-}  // namespace adc
-}  // namespace esphome
-
-#endif  // USE_RP2040

esphome/components/adc/sensor.py

@@ -1,61 +1,141 @@
-import logging
-
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
-from esphome.components.esp32 import get_esp32_variant
 import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import sensor, voltage_sampler
 from esphome.const import (
     CONF_ATTENUATION,
+    CONF_RAW,
     CONF_ID,
+    CONF_INPUT,
     CONF_NUMBER,
     CONF_PIN,
-    CONF_RAW,
     DEVICE_CLASS_VOLTAGE,
     STATE_CLASS_MEASUREMENT,
     UNIT_VOLT,
 )
 from esphome.core import CORE
-
-from . import (
-    ATTENUATION_MODES,
-    ESP32_VARIANT_ADC1_PIN_TO_CHANNEL,
-    ESP32_VARIANT_ADC2_PIN_TO_CHANNEL,
-    SAMPLING_MODES,
-    adc_ns,
-    adc_unit_t,
-    validate_adc_pin,
+from esphome.components.esp32 import get_esp32_variant
+from esphome.components.esp32.const import (
+    VARIANT_ESP32,
+    VARIANT_ESP32C3,
+    VARIANT_ESP32H2,
+    VARIANT_ESP32S2,
+    VARIANT_ESP32S3,
 )
 
-_LOGGER = logging.getLogger(__name__)
 
 AUTO_LOAD = ["voltage_sampler"]
 
-CONF_SAMPLES = "samples"
-CONF_SAMPLING_MODE = "sampling_mode"
+ATTENUATION_MODES = {
+    "0db": cg.global_ns.ADC_ATTEN_DB_0,
+    "2.5db": cg.global_ns.ADC_ATTEN_DB_2_5,
+    "6db": cg.global_ns.ADC_ATTEN_DB_6,
+    "11db": cg.global_ns.ADC_ATTEN_DB_11,
+    "auto": "auto",
+}
+
+adc1_channel_t = cg.global_ns.enum("adc1_channel_t")
+
+# From https://github.com/espressif/esp-idf/blob/master/components/driver/include/driver/adc_common.h
+# pin to adc1 channel mapping
+ESP32_VARIANT_ADC1_PIN_TO_CHANNEL = {
+    VARIANT_ESP32: {
+        36: adc1_channel_t.ADC1_CHANNEL_0,
+        37: adc1_channel_t.ADC1_CHANNEL_1,
+        38: adc1_channel_t.ADC1_CHANNEL_2,
+        39: adc1_channel_t.ADC1_CHANNEL_3,
+        32: adc1_channel_t.ADC1_CHANNEL_4,
+        33: adc1_channel_t.ADC1_CHANNEL_5,
+        34: adc1_channel_t.ADC1_CHANNEL_6,
+        35: adc1_channel_t.ADC1_CHANNEL_7,
+    },
+    VARIANT_ESP32S2: {
+        1: adc1_channel_t.ADC1_CHANNEL_0,
+        2: adc1_channel_t.ADC1_CHANNEL_1,
+        3: adc1_channel_t.ADC1_CHANNEL_2,
+        4: adc1_channel_t.ADC1_CHANNEL_3,
+        5: adc1_channel_t.ADC1_CHANNEL_4,
+        6: adc1_channel_t.ADC1_CHANNEL_5,
+        7: adc1_channel_t.ADC1_CHANNEL_6,
+        8: adc1_channel_t.ADC1_CHANNEL_7,
+        9: adc1_channel_t.ADC1_CHANNEL_8,
+        10: adc1_channel_t.ADC1_CHANNEL_9,
+    },
+    VARIANT_ESP32S3: {
+        1: adc1_channel_t.ADC1_CHANNEL_0,
+        2: adc1_channel_t.ADC1_CHANNEL_1,
+        3: adc1_channel_t.ADC1_CHANNEL_2,
+        4: adc1_channel_t.ADC1_CHANNEL_3,
+        5: adc1_channel_t.ADC1_CHANNEL_4,
+        6: adc1_channel_t.ADC1_CHANNEL_5,
+        7: adc1_channel_t.ADC1_CHANNEL_6,
+        8: adc1_channel_t.ADC1_CHANNEL_7,
+        9: adc1_channel_t.ADC1_CHANNEL_8,
+        10: adc1_channel_t.ADC1_CHANNEL_9,
+    },
+    VARIANT_ESP32C3: {
+        0: adc1_channel_t.ADC1_CHANNEL_0,
+        1: adc1_channel_t.ADC1_CHANNEL_1,
+        2: adc1_channel_t.ADC1_CHANNEL_2,
+        3: adc1_channel_t.ADC1_CHANNEL_3,
+        4: adc1_channel_t.ADC1_CHANNEL_4,
+    },
+    VARIANT_ESP32H2: {
+        0: adc1_channel_t.ADC1_CHANNEL_0,
+        1: adc1_channel_t.ADC1_CHANNEL_1,
+        2: adc1_channel_t.ADC1_CHANNEL_2,
+        3: adc1_channel_t.ADC1_CHANNEL_3,
+        4: adc1_channel_t.ADC1_CHANNEL_4,
+    },
+}
 
 
-_attenuation = cv.enum(ATTENUATION_MODES, lower=True)
-_sampling_mode = cv.enum(SAMPLING_MODES, lower=True)
+def validate_adc_pin(value):
+    if str(value).upper() == "VCC":
+        return cv.only_on_esp8266("VCC")
+
+    if str(value).upper() == "TEMPERATURE":
+        return cv.only_on_rp2040("TEMPERATURE")
+
+    if CORE.is_esp32:
+        value = pins.internal_gpio_input_pin_number(value)
+        variant = get_esp32_variant()
+        if variant not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL:
+            raise cv.Invalid(f"This ESP32 variant ({variant}) is not supported")
+
+        if value not in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]:
+            raise cv.Invalid(f"{variant} doesn't support ADC on this pin")
+        return pins.internal_gpio_input_pin_schema(value)
+
+    if CORE.is_esp8266:
+        from esphome.components.esp8266.gpio import CONF_ANALOG
+
+        value = pins.internal_gpio_pin_number({CONF_ANALOG: True, CONF_INPUT: True})(
+            value
+        )
+
+        if value != 17:  # A0
+            raise cv.Invalid("ESP8266: Only pin A0 (GPIO17) supports ADC.")
+        return pins.gpio_pin_schema(
+            {CONF_ANALOG: True, CONF_INPUT: True}, internal=True
+        )(value)
+
+    if CORE.is_rp2040:
+        value = pins.internal_gpio_input_pin_number(value)
+        if value not in (26, 27, 28, 29):
+            raise cv.Invalid("RP2040: Only pins 26, 27, 28 and 29 support ADC.")
+        return pins.internal_gpio_input_pin_schema(value)
+
+    raise NotImplementedError
 
 
 def validate_config(config):
     if config[CONF_RAW] and config.get(CONF_ATTENUATION, None) == "auto":
-        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set")
-
-    if config.get(CONF_ATTENUATION, None) == "auto" and config.get(CONF_SAMPLES, 1) > 1:
-        raise cv.Invalid(
-            "Automatic attenuation cannot be used when multisampling is set"
-        )
-    if config.get(CONF_ATTENUATION) == "11db":
-        _LOGGER.warning(
-            "`attenuation: 11db` is deprecated, use `attenuation: 12db` instead"
-        )
-        # Alter value here so `config` command prints the recommended change
-        config[CONF_ATTENUATION] = _attenuation("12db")
-
+        raise cv.Invalid("Automatic attenuation cannot be used when raw output is set.")
     return config
 
 
+adc_ns = cg.esphome_ns.namespace("adc")
 ADCSensor = adc_ns.class_(
     "ADCSensor", sensor.Sensor, cg.PollingComponent, voltage_sampler.VoltageSampler
 )
@@ -73,10 +153,8 @@ CONFIG_SCHEMA = cv.All(
             cv.Required(CONF_PIN): validate_adc_pin,
             cv.Optional(CONF_RAW, default=False): cv.boolean,
             cv.SplitDefault(CONF_ATTENUATION, esp32="0db"): cv.All(
-                cv.only_on_esp32, _attenuation
+                cv.only_on_esp32, cv.enum(ATTENUATION_MODES, lower=True)
             ),
-            cv.Optional(CONF_SAMPLES, default=1): cv.int_range(min=1, max=255),
-            cv.Optional(CONF_SAMPLING_MODE, default="avg"): _sampling_mode,
         }
     )
     .extend(cv.polling_component_schema("60s")),
@@ -97,28 +175,17 @@ async def to_code(config):
         pin = await cg.gpio_pin_expression(config[CONF_PIN])
         cg.add(var.set_pin(pin))
 
-    cg.add(var.set_output_raw(config[CONF_RAW]))
-    cg.add(var.set_sample_count(config[CONF_SAMPLES]))
-    cg.add(var.set_sampling_mode(config[CONF_SAMPLING_MODE]))
+    if CONF_RAW in config:
+        cg.add(var.set_output_raw(config[CONF_RAW]))
+
+    if CONF_ATTENUATION in config:
+        if config[CONF_ATTENUATION] == "auto":
+            cg.add(var.set_autorange(cg.global_ns.true))
+        else:
+            cg.add(var.set_attenuation(config[CONF_ATTENUATION]))
 
     if CORE.is_esp32:
-        if attenuation := config.get(CONF_ATTENUATION):
-            if attenuation == "auto":
-                cg.add(var.set_autorange(cg.global_ns.true))
-            else:
-                cg.add(var.set_attenuation(attenuation))
-
         variant = get_esp32_variant()
         pin_num = config[CONF_PIN][CONF_NUMBER]
-        if (
-            variant in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL
-            and pin_num in ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant]
-        ):
-            chan = ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant][pin_num]
-            cg.add(var.set_channel(adc_unit_t.ADC_UNIT_1, chan))
-        elif (
-            variant in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL
-            and pin_num in ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant]
-        ):
-            chan = ESP32_VARIANT_ADC2_PIN_TO_CHANNEL[variant][pin_num]
-            cg.add(var.set_channel(adc_unit_t.ADC_UNIT_2, chan))
+        chan = ESP32_VARIANT_ADC1_PIN_TO_CHANNEL[variant][pin_num]
+        cg.add(var.set_channel(chan))

esphome/components/adc128s102/__init__.py

@@ -1,6 +1,6 @@
 import esphome.codegen as cg
-from esphome.components import spi
 import esphome.config_validation as cv
+from esphome.components import spi
 from esphome.const import CONF_ID
 
 DEPENDENCIES = ["spi"]

esphome/components/adc128s102/adc128s102.cpp

@@ -9,7 +9,7 @@ static const char *const TAG = "adc128s102";
 float ADC128S102::get_setup_priority() const { return setup_priority::HARDWARE; }
 
 void ADC128S102::setup() {
-  ESP_LOGCONFIG(TAG, "Running setup");
+  ESP_LOGCONFIG(TAG, "Setting up adc128s102");
   this->spi_setup();
 }
 

esphome/components/adc128s102/sensor/__init__.py

@@ -1,9 +1,9 @@
 import esphome.codegen as cg
-from esphome.components import sensor, voltage_sampler
 import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.components import sensor, voltage_sampler
+from esphome.const import CONF_ID, CONF_CHANNEL
 
-from .. import ADC128S102, adc128s102_ns
+from .. import adc128s102_ns, ADC128S102
 
 AUTO_LOAD = ["voltage_sampler"]
 DEPENDENCIES = ["adc128s102"]
@@ -16,16 +16,13 @@ ADC128S102Sensor = adc128s102_ns.class_(
 )
 CONF_ADC128S102_ID = "adc128s102_id"
 
-CONFIG_SCHEMA = (
-    sensor.sensor_schema(ADC128S102Sensor)
-    .extend(
-        {
-            cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
-            cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-)
+CONFIG_SCHEMA = sensor.SENSOR_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(ADC128S102Sensor),
+        cv.GenerateID(CONF_ADC128S102_ID): cv.use_id(ADC128S102),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=7),
+    }
+).extend(cv.polling_component_schema("60s"))
 
 
 async def to_code(config):

esphome/components/addressable_light/addressable_light_display.h

@@ -10,7 +10,7 @@
 namespace esphome {
 namespace addressable_light {
 
-class AddressableLightDisplay : public display::DisplayBuffer {
+class AddressableLightDisplay : public display::DisplayBuffer, public PollingComponent {
  public:
   light::AddressableLight *get_light() const { return this->light_; }
 

esphome/components/addressable_light/display.py

@@ -1,15 +1,15 @@
 import esphome.codegen as cg
-from esphome.components import display, light
 import esphome.config_validation as cv
+from esphome.components import display, light
 from esphome.const import (
-    CONF_ADDRESSABLE_LIGHT_ID,
-    CONF_HEIGHT,
     CONF_ID,
     CONF_LAMBDA,
     CONF_PAGES,
-    CONF_PIXEL_MAPPER,
-    CONF_UPDATE_INTERVAL,
+    CONF_ADDRESSABLE_LIGHT_ID,
+    CONF_HEIGHT,
     CONF_WIDTH,
+    CONF_UPDATE_INTERVAL,
+    CONF_PIXEL_MAPPER,
 )
 
 CODEOWNERS = ["@justfalter"]
@@ -45,18 +45,19 @@ async def to_code(config):
     cg.add(var.set_height(config[CONF_HEIGHT]))
     cg.add(var.set_light(wrapped_light))
 
+    await cg.register_component(var, config)
     await display.register_display(var, config)
 
-    if pixel_mapper := config.get(CONF_PIXEL_MAPPER):
+    if CONF_PIXEL_MAPPER in config:
         pixel_mapper_template_ = await cg.process_lambda(
-            pixel_mapper,
+            config[CONF_PIXEL_MAPPER],
             [(int, "x"), (int, "y")],
             return_type=cg.int_,
         )
         cg.add(var.set_pixel_mapper(pixel_mapper_template_))
 
-    if lambda_config := config.get(CONF_LAMBDA):
+    if CONF_LAMBDA in config:
         lambda_ = await cg.process_lambda(
-            lambda_config, [(display.DisplayRef, "it")], return_type=cg.void
+            config[CONF_LAMBDA], [(display.DisplayBufferRef, "it")], return_type=cg.void
         )
         cg.add(var.set_writer(lambda_))

esphome/components/ade7880/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@kpfleming"]

esphome/components/ade7880/ade7880.cpp

@@ -1,315 +0,0 @@
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "ade7880.h"
-#include "ade7880_registers.h"
-#include "esphome/core/log.h"
-
-#include <cinttypes>
-
-namespace esphome {
-namespace ade7880 {
-
-static const char *const TAG = "ade7880";
-
-void IRAM_ATTR ADE7880Store::gpio_intr(ADE7880Store *arg) { arg->reset_done = true; }
-
-void ADE7880::setup() {
-  if (this->irq0_pin_ != nullptr) {
-    this->irq0_pin_->setup();
-  }
-  this->irq1_pin_->setup();
-  if (this->reset_pin_ != nullptr) {
-    this->reset_pin_->setup();
-  }
-  this->store_.irq1_pin = this->irq1_pin_->to_isr();
-  this->irq1_pin_->attach_interrupt(ADE7880Store::gpio_intr, &this->store_, gpio::INTERRUPT_FALLING_EDGE);
-
-  // if IRQ1 is already asserted, the cause must be determined
-  if (this->irq1_pin_->digital_read() == 0) {
-    ESP_LOGD(TAG, "IRQ1 found asserted during setup()");
-    auto status1 = read_u32_register16_(STATUS1);
-    if ((status1 & ~STATUS1_RSTDONE) != 0) {
-      // not safe to proceed, must initiate reset
-      ESP_LOGD(TAG, "IRQ1 asserted for !RSTDONE, resetting device");
-      this->reset_device_();
-      return;
-    }
-    if ((status1 & STATUS1_RSTDONE) == STATUS1_RSTDONE) {
-      // safe to proceed, device has just completed reset cycle
-      ESP_LOGD(TAG, "Acknowledging RSTDONE");
-      this->write_u32_register16_(STATUS0, 0xFFFF);
-      this->write_u32_register16_(STATUS1, 0xFFFF);
-      this->init_device_();
-      return;
-    }
-  }
-
-  this->reset_device_();
-}
-
-void ADE7880::loop() {
-  // check for completion of a reset cycle
-  if (!this->store_.reset_done) {
-    return;
-  }
-
-  ESP_LOGD(TAG, "Acknowledging RSTDONE");
-  this->write_u32_register16_(STATUS0, 0xFFFF);
-  this->write_u32_register16_(STATUS1, 0xFFFF);
-  this->init_device_();
-  this->store_.reset_done = false;
-  this->store_.reset_pending = false;
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s24zp_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s24zp_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s16_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s16_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-template<typename F>
-void ADE7880::update_sensor_from_s32_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f) {
-  if (sensor == nullptr) {
-    return;
-  }
-
-  float val = this->read_s32_register16_(a_register);
-  sensor->publish_state(f(val));
-}
-
-void ADE7880::update() {
-  if (this->store_.reset_pending) {
-    return;
-  }
-
-  auto start = millis();
-
-  if (this->channel_n_ != nullptr) {
-    auto *chan = this->channel_n_;
-    this->update_sensor_from_s24zp_register16_(chan->current, NIRMS, [](float val) { return val / 100000.0f; });
-  }
-
-  if (this->channel_a_ != nullptr) {
-    auto *chan = this->channel_a_;
-    this->update_sensor_from_s24zp_register16_(chan->current, AIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, BVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, AWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, AVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, APF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, AFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, AFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  if (this->channel_b_ != nullptr) {
-    auto *chan = this->channel_b_;
-    this->update_sensor_from_s24zp_register16_(chan->current, BIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, BVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, BWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, BVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, BPF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, BFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, BFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  if (this->channel_c_ != nullptr) {
-    auto *chan = this->channel_c_;
-    this->update_sensor_from_s24zp_register16_(chan->current, CIRMS, [](float val) { return val / 100000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->voltage, CVRMS, [](float val) { return val / 10000.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->active_power, CWATT, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s24zp_register16_(chan->apparent_power, CVA, [](float val) { return val / 100.0f; });
-    this->update_sensor_from_s16_register16_(chan->power_factor, CPF,
-                                             [](float val) { return std::abs(val / -327.68f); });
-    this->update_sensor_from_s32_register16_(chan->forward_active_energy, CFWATTHR, [&chan](float val) {
-      return chan->forward_active_energy_total += val / 14400.0f;
-    });
-    this->update_sensor_from_s32_register16_(chan->reverse_active_energy, CFWATTHR, [&chan](float val) {
-      return chan->reverse_active_energy_total += val / 14400.0f;
-    });
-  }
-
-  ESP_LOGD(TAG, "update took %" PRIu32 " ms", millis() - start);
-}
-
-void ADE7880::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7880:");
-  LOG_PIN("  IRQ0  Pin: ", this->irq0_pin_);
-  LOG_PIN("  IRQ1  Pin: ", this->irq1_pin_);
-  LOG_PIN("  RESET Pin: ", this->reset_pin_);
-  ESP_LOGCONFIG(TAG, "  Frequency: %.0f Hz", this->frequency_);
-
-  if (this->channel_a_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase A:");
-    LOG_SENSOR("    ", "Current", this->channel_a_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_a_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_a_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_a_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_a_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_a_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_a_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG,
-                  "    Calibration:\n"
-                  "     Current: %" PRId32 "\n"
-                  "     Voltage: %" PRId32 "\n"
-                  "     Power: %" PRId32 "\n"
-                  "     Phase Angle: %u",
-                  this->channel_a_->current_gain_calibration, this->channel_a_->voltage_gain_calibration,
-                  this->channel_a_->power_gain_calibration, this->channel_a_->phase_angle_calibration);
-  }
-
-  if (this->channel_b_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase B:");
-    LOG_SENSOR("    ", "Current", this->channel_b_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_b_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_b_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_b_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_b_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_b_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_b_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG,
-                  "    Calibration:\n"
-                  "     Current: %" PRId32 "\n"
-                  "     Voltage: %" PRId32 "\n"
-                  "     Power: %" PRId32 "\n"
-                  "     Phase Angle: %u",
-                  this->channel_b_->current_gain_calibration, this->channel_b_->voltage_gain_calibration,
-                  this->channel_b_->power_gain_calibration, this->channel_b_->phase_angle_calibration);
-  }
-
-  if (this->channel_c_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Phase C:");
-    LOG_SENSOR("    ", "Current", this->channel_c_->current);
-    LOG_SENSOR("    ", "Voltage", this->channel_c_->voltage);
-    LOG_SENSOR("    ", "Active Power", this->channel_c_->active_power);
-    LOG_SENSOR("    ", "Apparent Power", this->channel_c_->apparent_power);
-    LOG_SENSOR("    ", "Power Factor", this->channel_c_->power_factor);
-    LOG_SENSOR("    ", "Forward Active Energy", this->channel_c_->forward_active_energy);
-    LOG_SENSOR("    ", "Reverse Active Energy", this->channel_c_->reverse_active_energy);
-    ESP_LOGCONFIG(TAG,
-                  "    Calibration:\n"
-                  "     Current: %" PRId32 "\n"
-                  "     Voltage: %" PRId32 "\n"
-                  "     Power: %" PRId32 "\n"
-                  "     Phase Angle: %u",
-                  this->channel_c_->current_gain_calibration, this->channel_c_->voltage_gain_calibration,
-                  this->channel_c_->power_gain_calibration, this->channel_c_->phase_angle_calibration);
-  }
-
-  if (this->channel_n_ != nullptr) {
-    ESP_LOGCONFIG(TAG, "  Neutral:");
-    LOG_SENSOR("    ", "Current", this->channel_n_->current);
-    ESP_LOGCONFIG(TAG,
-                  "    Calibration:\n"
-                  "     Current: %" PRId32,
-                  this->channel_n_->current_gain_calibration);
-  }
-
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-}
-
-void ADE7880::calibrate_s10zp_reading_(uint16_t a_register, int16_t calibration) {
-  if (calibration == 0) {
-    return;
-  }
-
-  this->write_s10zp_register16_(a_register, calibration);
-}
-
-void ADE7880::calibrate_s24zpse_reading_(uint16_t a_register, int32_t calibration) {
-  if (calibration == 0) {
-    return;
-  }
-
-  this->write_s24zpse_register16_(a_register, calibration);
-}
-
-void ADE7880::init_device_() {
-  this->write_u8_register16_(CONFIG2, CONFIG2_I2C_LOCK);
-
-  this->write_u16_register16_(GAIN, 0);
-
-  if (this->frequency_ > 55) {
-    this->write_u16_register16_(COMPMODE, COMPMODE_DEFAULT | COMPMODE_SELFREQ);
-  }
-
-  if (this->channel_n_ != nullptr) {
-    this->calibrate_s24zpse_reading_(NIGAIN, this->channel_n_->current_gain_calibration);
-  }
-
-  if (this->channel_a_ != nullptr) {
-    this->calibrate_s24zpse_reading_(AIGAIN, this->channel_a_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(AVGAIN, this->channel_a_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(APGAIN, this->channel_a_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(APHCAL, this->channel_a_->phase_angle_calibration);
-  }
-
-  if (this->channel_b_ != nullptr) {
-    this->calibrate_s24zpse_reading_(BIGAIN, this->channel_b_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(BVGAIN, this->channel_b_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(BPGAIN, this->channel_b_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(BPHCAL, this->channel_b_->phase_angle_calibration);
-  }
-
-  if (this->channel_c_ != nullptr) {
-    this->calibrate_s24zpse_reading_(CIGAIN, this->channel_c_->current_gain_calibration);
-    this->calibrate_s24zpse_reading_(CVGAIN, this->channel_c_->voltage_gain_calibration);
-    this->calibrate_s24zpse_reading_(CPGAIN, this->channel_c_->power_gain_calibration);
-    this->calibrate_s10zp_reading_(CPHCAL, this->channel_c_->phase_angle_calibration);
-  }
-
-  // write three default values to data memory RAM to flush the I2C write queue
-  this->write_s32_register16_(VLEVEL, 0);
-  this->write_s32_register16_(VLEVEL, 0);
-  this->write_s32_register16_(VLEVEL, 0);
-
-  this->write_u8_register16_(DSPWP_SEL, DSPWP_SEL_SET);
-  this->write_u8_register16_(DSPWP_SET, DSPWP_SET_RO);
-  this->write_u16_register16_(RUN, RUN_ENABLE);
-}
-
-void ADE7880::reset_device_() {
-  if (this->reset_pin_ != nullptr) {
-    ESP_LOGD(TAG, "Reset device using RESET pin");
-    this->reset_pin_->digital_write(false);
-    delay(1);
-    this->reset_pin_->digital_write(true);
-  } else {
-    ESP_LOGD(TAG, "Reset device using SWRST command");
-    this->write_u16_register16_(CONFIG, CONFIG_SWRST);
-  }
-  this->store_.reset_pending = true;
-}
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880.h

@@ -1,129 +0,0 @@
-#pragma once
-
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-
-#include "ade7880_registers.h"
-
-namespace esphome {
-namespace ade7880 {
-
-struct NeutralChannel {
-  void set_current(sensor::Sensor *sens) { this->current = sens; }
-
-  void set_current_gain_calibration(int32_t val) { this->current_gain_calibration = val; }
-
-  sensor::Sensor *current{nullptr};
-  int32_t current_gain_calibration{0};
-};
-
-struct PowerChannel {
-  void set_current(sensor::Sensor *sens) { this->current = sens; }
-  void set_voltage(sensor::Sensor *sens) { this->voltage = sens; }
-  void set_active_power(sensor::Sensor *sens) { this->active_power = sens; }
-  void set_apparent_power(sensor::Sensor *sens) { this->apparent_power = sens; }
-  void set_power_factor(sensor::Sensor *sens) { this->power_factor = sens; }
-  void set_forward_active_energy(sensor::Sensor *sens) { this->forward_active_energy = sens; }
-  void set_reverse_active_energy(sensor::Sensor *sens) { this->reverse_active_energy = sens; }
-
-  void set_current_gain_calibration(int32_t val) { this->current_gain_calibration = val; }
-  void set_voltage_gain_calibration(int32_t val) { this->voltage_gain_calibration = val; }
-  void set_power_gain_calibration(int32_t val) { this->power_gain_calibration = val; }
-  void set_phase_angle_calibration(int32_t val) { this->phase_angle_calibration = val; }
-
-  sensor::Sensor *current{nullptr};
-  sensor::Sensor *voltage{nullptr};
-  sensor::Sensor *active_power{nullptr};
-  sensor::Sensor *apparent_power{nullptr};
-  sensor::Sensor *power_factor{nullptr};
-  sensor::Sensor *forward_active_energy{nullptr};
-  sensor::Sensor *reverse_active_energy{nullptr};
-  int32_t current_gain_calibration{0};
-  int32_t voltage_gain_calibration{0};
-  int32_t power_gain_calibration{0};
-  uint16_t phase_angle_calibration{0};
-  float forward_active_energy_total{0};
-  float reverse_active_energy_total{0};
-};
-
-// Store data in a class that doesn't use multiple-inheritance (no vtables in flash!)
-struct ADE7880Store {
-  volatile bool reset_done{false};
-  bool reset_pending{false};
-  ISRInternalGPIOPin irq1_pin;
-
-  static void gpio_intr(ADE7880Store *arg);
-};
-
-class ADE7880 : public i2c::I2CDevice, public PollingComponent {
- public:
-  void set_irq0_pin(InternalGPIOPin *pin) { this->irq0_pin_ = pin; }
-  void set_irq1_pin(InternalGPIOPin *pin) { this->irq1_pin_ = pin; }
-  void set_reset_pin(InternalGPIOPin *pin) { this->reset_pin_ = pin; }
-  void set_frequency(float frequency) { this->frequency_ = frequency; }
-  void set_channel_n(NeutralChannel *channel) { this->channel_n_ = channel; }
-  void set_channel_a(PowerChannel *channel) { this->channel_a_ = channel; }
-  void set_channel_b(PowerChannel *channel) { this->channel_b_ = channel; }
-  void set_channel_c(PowerChannel *channel) { this->channel_c_ = channel; }
-
-  void setup() override;
-
-  void loop() override;
-
-  void update() override;
-
-  void dump_config() override;
-
- protected:
-  ADE7880Store store_{};
-  InternalGPIOPin *irq0_pin_{nullptr};
-  InternalGPIOPin *irq1_pin_{nullptr};
-  InternalGPIOPin *reset_pin_{nullptr};
-  float frequency_;
-  NeutralChannel *channel_n_{nullptr};
-  PowerChannel *channel_a_{nullptr};
-  PowerChannel *channel_b_{nullptr};
-  PowerChannel *channel_c_{nullptr};
-
-  void calibrate_s10zp_reading_(uint16_t a_register, int16_t calibration);
-  void calibrate_s24zpse_reading_(uint16_t a_register, int32_t calibration);
-
-  void init_device_();
-
-  // each of these functions allow the caller to pass in a lambda (or any other callable)
-  // which modifies the value read from the register before it is passed to the sensor
-  // the callable will be passed a 'float' value and is expected to return a 'float'
-  template<typename F> void update_sensor_from_s24zp_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-  template<typename F> void update_sensor_from_s16_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-  template<typename F> void update_sensor_from_s32_register16_(sensor::Sensor *sensor, uint16_t a_register, F &&f);
-
-  void reset_device_();
-
-  uint8_t read_u8_register16_(uint16_t a_register);
-  int16_t read_s16_register16_(uint16_t a_register);
-  uint16_t read_u16_register16_(uint16_t a_register);
-  int32_t read_s24zp_register16_(uint16_t a_register);
-  int32_t read_s32_register16_(uint16_t a_register);
-  uint32_t read_u32_register16_(uint16_t a_register);
-
-  void write_u8_register16_(uint16_t a_register, uint8_t value);
-  void write_s10zp_register16_(uint16_t a_register, int16_t value);
-  void write_u16_register16_(uint16_t a_register, uint16_t value);
-  void write_s24zpse_register16_(uint16_t a_register, int32_t value);
-  void write_s32_register16_(uint16_t a_register, int32_t value);
-  void write_u32_register16_(uint16_t a_register, uint32_t value);
-};
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880_i2c.cpp

@@ -1,101 +0,0 @@
-// This component was developed using knowledge gathered by a number
-// of people who reverse-engineered the Shelly 3EM:
-//
-// @AndreKR on GitHub
-// Axel (@Axel830 on GitHub)
-// Marko (@goodkiller on GitHub)
-// Michaël Piron (@michaelpiron on GitHub)
-// Theo Arends (@arendst on GitHub)
-
-#include "ade7880.h"
-
-namespace esphome {
-namespace ade7880 {
-
-// adapted from https://stackoverflow.com/a/55912127/1886371
-template<size_t Bits, typename T> inline T sign_extend(const T &v) noexcept {
-  using S = struct { signed Val : Bits; };
-  return reinterpret_cast<const S *>(&v)->Val;
-}
-
-// Register types
-// unsigned 8-bit (uint8_t)
-// signed 10-bit - 16-bit ZP on wire (int16_t, needs sign extension)
-// unsigned 16-bit (uint16_t)
-// unsigned 20-bit - 32-bit ZP on wire (uint32_t)
-// signed 24-bit - 32-bit ZPSE on wire (int32_t, needs sign extension)
-// signed 24-bit - 32-bit ZP on wire (int32_t, needs sign extension)
-// signed 24-bit - 32-bit SE on wire (int32_t)
-// signed 28-bit - 32-bit ZP on wire (int32_t, needs sign extension)
-// unsigned 32-bit (uint32_t)
-// signed 32-bit (int32_t)
-
-uint8_t ADE7880::read_u8_register16_(uint16_t a_register) {
-  uint8_t in;
-  this->read_register16(a_register, &in, sizeof(in));
-  return in;
-}
-
-int16_t ADE7880::read_s16_register16_(uint16_t a_register) {
-  int16_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-uint16_t ADE7880::read_u16_register16_(uint16_t a_register) {
-  uint16_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-int32_t ADE7880::read_s24zp_register16_(uint16_t a_register) {
-  // s24zp means 24 bit signed value in the lower 24 bits of a 32-bit register
-  int32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return sign_extend<24>(convert_big_endian(in));
-}
-
-int32_t ADE7880::read_s32_register16_(uint16_t a_register) {
-  int32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-uint32_t ADE7880::read_u32_register16_(uint16_t a_register) {
-  uint32_t in;
-  this->read_register16(a_register, reinterpret_cast<uint8_t *>(&in), sizeof(in));
-  return convert_big_endian(in);
-}
-
-void ADE7880::write_u8_register16_(uint16_t a_register, uint8_t value) {
-  this->write_register16(a_register, &value, sizeof(value));
-}
-
-void ADE7880::write_s10zp_register16_(uint16_t a_register, int16_t value) {
-  int16_t out = convert_big_endian(value & 0x03FF);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_u16_register16_(uint16_t a_register, uint16_t value) {
-  uint16_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_s24zpse_register16_(uint16_t a_register, int32_t value) {
-  // s24zpse means a 24-bit signed value, sign-extended to 28 bits, in the lower 28 bits of a 32-bit register
-  int32_t out = convert_big_endian(value & 0x0FFFFFFF);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_s32_register16_(uint16_t a_register, int32_t value) {
-  int32_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-void ADE7880::write_u32_register16_(uint16_t a_register, uint32_t value) {
-  uint32_t out = convert_big_endian(value);
-  this->write_register16(a_register, reinterpret_cast<uint8_t *>(&out), sizeof(out));
-}
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/ade7880_registers.h

@@ -1,243 +0,0 @@
-#pragma once
-
-// This file is a modified version of the one created by Michaël Piron (@michaelpiron on GitHub)
-
-// Source: https://www.analog.com/media/en/technical-documentation/application-notes/AN-1127.pdf
-
-namespace esphome {
-namespace ade7880 {
-
-// DSP Data Memory RAM registers
-constexpr uint16_t AIGAIN = 0x4380;
-constexpr uint16_t AVGAIN = 0x4381;
-constexpr uint16_t BIGAIN = 0x4382;
-constexpr uint16_t BVGAIN = 0x4383;
-constexpr uint16_t CIGAIN = 0x4384;
-constexpr uint16_t CVGAIN = 0x4385;
-constexpr uint16_t NIGAIN = 0x4386;
-
-constexpr uint16_t DICOEFF = 0x4388;
-
-constexpr uint16_t APGAIN = 0x4389;
-constexpr uint16_t AWATTOS = 0x438A;
-constexpr uint16_t BPGAIN = 0x438B;
-constexpr uint16_t BWATTOS = 0x438C;
-constexpr uint16_t CPGAIN = 0x438D;
-constexpr uint16_t CWATTOS = 0x438E;
-constexpr uint16_t AIRMSOS = 0x438F;
-constexpr uint16_t AVRMSOS = 0x4390;
-constexpr uint16_t BIRMSOS = 0x4391;
-constexpr uint16_t BVRMSOS = 0x4392;
-constexpr uint16_t CIRMSOS = 0x4393;
-constexpr uint16_t CVRMSOS = 0x4394;
-constexpr uint16_t NIRMSOS = 0x4395;
-constexpr uint16_t HPGAIN = 0x4398;
-constexpr uint16_t ISUMLVL = 0x4399;
-
-constexpr uint16_t VLEVEL = 0x439F;
-
-constexpr uint16_t AFWATTOS = 0x43A2;
-constexpr uint16_t BFWATTOS = 0x43A3;
-constexpr uint16_t CFWATTOS = 0x43A4;
-
-constexpr uint16_t AFVAROS = 0x43A5;
-constexpr uint16_t BFVAROS = 0x43A6;
-constexpr uint16_t CFVAROS = 0x43A7;
-
-constexpr uint16_t AFIRMSOS = 0x43A8;
-constexpr uint16_t BFIRMSOS = 0x43A9;
-constexpr uint16_t CFIRMSOS = 0x43AA;
-
-constexpr uint16_t AFVRMSOS = 0x43AB;
-constexpr uint16_t BFVRMSOS = 0x43AC;
-constexpr uint16_t CFVRMSOS = 0x43AD;
-
-constexpr uint16_t HXWATTOS = 0x43AE;
-constexpr uint16_t HYWATTOS = 0x43AF;
-constexpr uint16_t HZWATTOS = 0x43B0;
-constexpr uint16_t HXVAROS = 0x43B1;
-constexpr uint16_t HYVAROS = 0x43B2;
-constexpr uint16_t HZVAROS = 0x43B3;
-
-constexpr uint16_t HXIRMSOS = 0x43B4;
-constexpr uint16_t HYIRMSOS = 0x43B5;
-constexpr uint16_t HZIRMSOS = 0x43B6;
-constexpr uint16_t HXVRMSOS = 0x43B7;
-constexpr uint16_t HYVRMSOS = 0x43B8;
-constexpr uint16_t HZVRMSOS = 0x43B9;
-
-constexpr uint16_t AIRMS = 0x43C0;
-constexpr uint16_t AVRMS = 0x43C1;
-constexpr uint16_t BIRMS = 0x43C2;
-constexpr uint16_t BVRMS = 0x43C3;
-constexpr uint16_t CIRMS = 0x43C4;
-constexpr uint16_t CVRMS = 0x43C5;
-constexpr uint16_t NIRMS = 0x43C6;
-
-constexpr uint16_t ISUM = 0x43C7;
-
-// Internal DSP Memory RAM registers
-constexpr uint16_t RUN = 0xE228;
-
-constexpr uint16_t AWATTHR = 0xE400;
-constexpr uint16_t BWATTHR = 0xE401;
-constexpr uint16_t CWATTHR = 0xE402;
-constexpr uint16_t AFWATTHR = 0xE403;
-constexpr uint16_t BFWATTHR = 0xE404;
-constexpr uint16_t CFWATTHR = 0xE405;
-constexpr uint16_t AFVARHR = 0xE409;
-constexpr uint16_t BFVARHR = 0xE40A;
-constexpr uint16_t CFVARHR = 0xE40B;
-
-constexpr uint16_t AVAHR = 0xE40C;
-constexpr uint16_t BVAHR = 0xE40D;
-constexpr uint16_t CVAHR = 0xE40E;
-
-constexpr uint16_t IPEAK = 0xE500;
-constexpr uint16_t VPEAK = 0xE501;
-
-constexpr uint16_t STATUS0 = 0xE502;
-constexpr uint16_t STATUS1 = 0xE503;
-
-constexpr uint16_t AIMAV = 0xE504;
-constexpr uint16_t BIMAV = 0xE505;
-constexpr uint16_t CIMAV = 0xE506;
-
-constexpr uint16_t OILVL = 0xE507;
-constexpr uint16_t OVLVL = 0xE508;
-constexpr uint16_t SAGLVL = 0xE509;
-constexpr uint16_t MASK0 = 0xE50A;
-constexpr uint16_t MASK1 = 0xE50B;
-
-constexpr uint16_t IAWV = 0xE50C;
-constexpr uint16_t IBWV = 0xE50D;
-constexpr uint16_t ICWV = 0xE50E;
-constexpr uint16_t INWV = 0xE50F;
-constexpr uint16_t VAWV = 0xE510;
-constexpr uint16_t VBWV = 0xE511;
-constexpr uint16_t VCWV = 0xE512;
-
-constexpr uint16_t AWATT = 0xE513;
-constexpr uint16_t BWATT = 0xE514;
-constexpr uint16_t CWATT = 0xE515;
-
-constexpr uint16_t AFVAR = 0xE516;
-constexpr uint16_t BFVAR = 0xE517;
-constexpr uint16_t CFVAR = 0xE518;
-
-constexpr uint16_t AVA = 0xE519;
-constexpr uint16_t BVA = 0xE51A;
-constexpr uint16_t CVA = 0xE51B;
-
-constexpr uint16_t CHECKSUM = 0xE51F;
-constexpr uint16_t VNOM = 0xE520;
-constexpr uint16_t LAST_RWDATA_24BIT = 0xE5FF;
-constexpr uint16_t PHSTATUS = 0xE600;
-constexpr uint16_t ANGLE0 = 0xE601;
-constexpr uint16_t ANGLE1 = 0xE602;
-constexpr uint16_t ANGLE2 = 0xE603;
-constexpr uint16_t PHNOLOAD = 0xE608;
-constexpr uint16_t LINECYC = 0xE60C;
-constexpr uint16_t ZXTOUT = 0xE60D;
-constexpr uint16_t COMPMODE = 0xE60E;
-constexpr uint16_t GAIN = 0xE60F;
-constexpr uint16_t CFMODE = 0xE610;
-constexpr uint16_t CF1DEN = 0xE611;
-constexpr uint16_t CF2DEN = 0xE612;
-constexpr uint16_t CF3DEN = 0xE613;
-constexpr uint16_t APHCAL = 0xE614;
-constexpr uint16_t BPHCAL = 0xE615;
-constexpr uint16_t CPHCAL = 0xE616;
-constexpr uint16_t PHSIGN = 0xE617;
-constexpr uint16_t CONFIG = 0xE618;
-constexpr uint16_t MMODE = 0xE700;
-constexpr uint16_t ACCMODE = 0xE701;
-constexpr uint16_t LCYCMODE = 0xE702;
-constexpr uint16_t PEAKCYC = 0xE703;
-constexpr uint16_t SAGCYC = 0xE704;
-constexpr uint16_t CFCYC = 0xE705;
-constexpr uint16_t HSDC_CFG = 0xE706;
-constexpr uint16_t VERSION = 0xE707;
-constexpr uint16_t DSPWP_SET = 0xE7E3;
-constexpr uint16_t LAST_RWDATA_8BIT = 0xE7FD;
-constexpr uint16_t DSPWP_SEL = 0xE7FE;
-constexpr uint16_t FVRMS = 0xE880;
-constexpr uint16_t FIRMS = 0xE881;
-constexpr uint16_t FWATT = 0xE882;
-constexpr uint16_t FVAR = 0xE883;
-constexpr uint16_t FVA = 0xE884;
-constexpr uint16_t FPF = 0xE885;
-constexpr uint16_t VTHDN = 0xE886;
-constexpr uint16_t ITHDN = 0xE887;
-constexpr uint16_t HXVRMS = 0xE888;
-constexpr uint16_t HXIRMS = 0xE889;
-constexpr uint16_t HXWATT = 0xE88A;
-constexpr uint16_t HXVAR = 0xE88B;
-constexpr uint16_t HXVA = 0xE88C;
-constexpr uint16_t HXPF = 0xE88D;
-constexpr uint16_t HXVHD = 0xE88E;
-constexpr uint16_t HXIHD = 0xE88F;
-constexpr uint16_t HYVRMS = 0xE890;
-constexpr uint16_t HYIRMS = 0xE891;
-constexpr uint16_t HYWATT = 0xE892;
-constexpr uint16_t HYVAR = 0xE893;
-constexpr uint16_t HYVA = 0xE894;
-constexpr uint16_t HYPF = 0xE895;
-constexpr uint16_t HYVHD = 0xE896;
-constexpr uint16_t HYIHD = 0xE897;
-constexpr uint16_t HZVRMS = 0xE898;
-constexpr uint16_t HZIRMS = 0xE899;
-constexpr uint16_t HZWATT = 0xE89A;
-constexpr uint16_t HZVAR = 0xE89B;
-constexpr uint16_t HZVA = 0xE89C;
-constexpr uint16_t HZPF = 0xE89D;
-constexpr uint16_t HZVHD = 0xE89E;
-constexpr uint16_t HZIHD = 0xE89F;
-constexpr uint16_t HCONFIG = 0xE900;
-constexpr uint16_t APF = 0xE902;
-constexpr uint16_t BPF = 0xE903;
-constexpr uint16_t CPF = 0xE904;
-constexpr uint16_t APERIOD = 0xE905;
-constexpr uint16_t BPERIOD = 0xE906;
-constexpr uint16_t CPERIOD = 0xE907;
-constexpr uint16_t APNOLOAD = 0xE908;
-constexpr uint16_t VARNOLOAD = 0xE909;
-constexpr uint16_t VANOLOAD = 0xE90A;
-constexpr uint16_t LAST_ADD = 0xE9FE;
-constexpr uint16_t LAST_RWDATA_16BIT = 0xE9FF;
-constexpr uint16_t CONFIG3 = 0xEA00;
-constexpr uint16_t LAST_OP = 0xEA01;
-constexpr uint16_t WTHR = 0xEA02;
-constexpr uint16_t VARTHR = 0xEA03;
-constexpr uint16_t VATHR = 0xEA04;
-
-constexpr uint16_t HX_REG = 0xEA08;
-constexpr uint16_t HY_REG = 0xEA09;
-constexpr uint16_t HZ_REG = 0xEA0A;
-constexpr uint16_t LPOILVL = 0xEC00;
-constexpr uint16_t CONFIG2 = 0xEC01;
-
-// STATUS1 Register Bits
-constexpr uint32_t STATUS1_RSTDONE = (1 << 15);
-
-// CONFIG Register Bits
-constexpr uint16_t CONFIG_SWRST = (1 << 7);
-
-// CONFIG2 Register Bits
-constexpr uint8_t CONFIG2_I2C_LOCK = (1 << 1);
-
-// COMPMODE Register Bits
-constexpr uint16_t COMPMODE_DEFAULT = 0x01FF;
-constexpr uint16_t COMPMODE_SELFREQ = (1 << 14);
-
-// RUN Register Bits
-constexpr uint16_t RUN_ENABLE = (1 << 0);
-
-// DSPWP_SET Register Bits
-constexpr uint8_t DSPWP_SET_RO = (1 << 7);
-
-// DSPWP_SEL Register Bits
-constexpr uint8_t DSPWP_SEL_SET = 0xAD;
-
-}  // namespace ade7880
-}  // namespace esphome

esphome/components/ade7880/sensor.py

@@ -1,290 +0,0 @@
-from esphome import pins
-import esphome.codegen as cg
-from esphome.components import i2c, sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_ACTIVE_POWER,
-    CONF_APPARENT_POWER,
-    CONF_CALIBRATION,
-    CONF_CURRENT,
-    CONF_FORWARD_ACTIVE_ENERGY,
-    CONF_FREQUENCY,
-    CONF_ID,
-    CONF_NAME,
-    CONF_PHASE_A,
-    CONF_PHASE_ANGLE,
-    CONF_PHASE_B,
-    CONF_PHASE_C,
-    CONF_POWER_FACTOR,
-    CONF_RESET_PIN,
-    CONF_REVERSE_ACTIVE_ENERGY,
-    CONF_VOLTAGE,
-    CONF_VOLTAGE_GAIN,
-    DEVICE_CLASS_APPARENT_POWER,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    STATE_CLASS_TOTAL_INCREASING,
-    UNIT_AMPERE,
-    UNIT_PERCENT,
-    UNIT_VOLT,
-    UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE_HOURS,
-    UNIT_WATT,
-    UNIT_WATT_HOURS,
-)
-
-DEPENDENCIES = ["i2c"]
-
-ade7880_ns = cg.esphome_ns.namespace("ade7880")
-ADE7880 = ade7880_ns.class_("ADE7880", cg.PollingComponent, i2c.I2CDevice)
-NeutralChannel = ade7880_ns.struct("NeutralChannel")
-PowerChannel = ade7880_ns.struct("PowerChannel")
-
-CONF_CURRENT_GAIN = "current_gain"
-CONF_IRQ0_PIN = "irq0_pin"
-CONF_IRQ1_PIN = "irq1_pin"
-CONF_POWER_GAIN = "power_gain"
-
-CONF_NEUTRAL = "neutral"
-
-NEUTRAL_CHANNEL_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(NeutralChannel),
-        cv.Optional(CONF_NAME): cv.string_strict,
-        cv.Required(CONF_CURRENT): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Required(CONF_CALIBRATION): cv.Schema(
-            {
-                cv.Required(CONF_CURRENT_GAIN): cv.int_,
-            },
-        ),
-    }
-)
-
-POWER_CHANNEL_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(): cv.declare_id(PowerChannel),
-        cv.Optional(CONF_NAME): cv.string_strict,
-        cv.Optional(CONF_VOLTAGE): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_CURRENT): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_APPARENT_POWER): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT_AMPS,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_APPARENT_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_POWER_FACTOR): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_PERCENT,
-                accuracy_decimals=0,
-                device_class=DEVICE_CLASS_POWER_FACTOR,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_FORWARD_ACTIVE_ENERGY): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Optional(CONF_REVERSE_ACTIVE_ENERGY): cv.maybe_simple_value(
-            sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE_HOURS,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_ENERGY,
-                state_class=STATE_CLASS_TOTAL_INCREASING,
-            ),
-            key=CONF_NAME,
-        ),
-        cv.Required(CONF_CALIBRATION): cv.Schema(
-            {
-                cv.Required(CONF_CURRENT_GAIN): cv.int_,
-                cv.Required(CONF_VOLTAGE_GAIN): cv.int_,
-                cv.Required(CONF_POWER_GAIN): cv.int_,
-                cv.Required(CONF_PHASE_ANGLE): cv.int_,
-            },
-        ),
-    }
-)
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADE7880),
-            cv.Optional(CONF_FREQUENCY, default="50Hz"): cv.All(
-                cv.frequency, cv.Range(min=45.0, max=66.0)
-            ),
-            cv.Optional(CONF_IRQ0_PIN): pins.internal_gpio_input_pin_schema,
-            cv.Required(CONF_IRQ1_PIN): pins.internal_gpio_input_pin_schema,
-            cv.Optional(CONF_RESET_PIN): pins.internal_gpio_output_pin_schema,
-            cv.Optional(CONF_PHASE_A): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_PHASE_B): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_PHASE_C): POWER_CHANNEL_SCHEMA,
-            cv.Optional(CONF_NEUTRAL): NEUTRAL_CHANNEL_SCHEMA,
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x38))
-)
-
-
-async def neutral_channel(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-
-    current = config[CONF_CURRENT]
-    sens = await sensor.new_sensor(current)
-    cg.add(var.set_current(sens))
-
-    cg.add(
-        var.set_current_gain_calibration(config[CONF_CALIBRATION][CONF_CURRENT_GAIN])
-    )
-
-    return var
-
-
-async def power_channel(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-
-    for sensor_type in [
-        CONF_CURRENT,
-        CONF_VOLTAGE,
-        CONF_ACTIVE_POWER,
-        CONF_APPARENT_POWER,
-        CONF_POWER_FACTOR,
-        CONF_FORWARD_ACTIVE_ENERGY,
-        CONF_REVERSE_ACTIVE_ENERGY,
-    ]:
-        if conf := config.get(sensor_type):
-            sens = await sensor.new_sensor(conf)
-            cg.add(getattr(var, f"set_{sensor_type}")(sens))
-
-    for calib_type in [
-        CONF_CURRENT_GAIN,
-        CONF_VOLTAGE_GAIN,
-        CONF_POWER_GAIN,
-        CONF_PHASE_ANGLE,
-    ]:
-        cg.add(
-            getattr(var, f"set_{calib_type}_calibration")(
-                config[CONF_CALIBRATION][calib_type]
-            )
-        )
-
-    return var
-
-
-def final_validate(config):
-    for channel in [CONF_PHASE_A, CONF_PHASE_B, CONF_PHASE_C]:
-        if channel := config.get(channel):
-            channel_name = channel.get(CONF_NAME)
-
-            for sensor_type in [
-                CONF_CURRENT,
-                CONF_VOLTAGE,
-                CONF_ACTIVE_POWER,
-                CONF_APPARENT_POWER,
-                CONF_POWER_FACTOR,
-                CONF_FORWARD_ACTIVE_ENERGY,
-                CONF_REVERSE_ACTIVE_ENERGY,
-            ]:
-                if conf := channel.get(sensor_type):
-                    sensor_name = conf.get(CONF_NAME)
-                    if (
-                        sensor_name
-                        and channel_name
-                        and not sensor_name.startswith(channel_name)
-                    ):
-                        conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-    if channel := config.get(CONF_NEUTRAL):
-        channel_name = channel.get(CONF_NAME)
-        if conf := channel.get(CONF_CURRENT):
-            sensor_name = conf.get(CONF_NAME)
-            if (
-                sensor_name
-                and channel_name
-                and not sensor_name.startswith(channel_name)
-            ):
-                conf[CONF_NAME] = f"{channel_name} {sensor_name}"
-
-
-FINAL_VALIDATE_SCHEMA = final_validate
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    if irq0_pin := config.get(CONF_IRQ0_PIN):
-        pin = await cg.gpio_pin_expression(irq0_pin)
-        cg.add(var.set_irq0_pin(pin))
-
-    pin = await cg.gpio_pin_expression(config[CONF_IRQ1_PIN])
-    cg.add(var.set_irq1_pin(pin))
-
-    if reset_pin := config.get(CONF_RESET_PIN):
-        pin = await cg.gpio_pin_expression(reset_pin)
-        cg.add(var.set_reset_pin(pin))
-
-    if frequency := config.get(CONF_FREQUENCY):
-        cg.add(var.set_frequency(frequency))
-
-    if channel := config.get(CONF_PHASE_A):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_a(chan))
-
-    if channel := config.get(CONF_PHASE_B):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_b(chan))
-
-    if channel := config.get(CONF_PHASE_C):
-        chan = await power_channel(channel)
-        cg.add(var.set_channel_c(chan))
-
-    if channel := config.get(CONF_NEUTRAL):
-        chan = await neutral_channel(channel)
-        cg.add(var.set_channel_n(chan))

esphome/components/ade7953/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@angelnu"]

esphome/components/ade7953/ade7953.cpp

@@ -0,0 +1,53 @@
+#include "ade7953.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ade7953 {
+
+static const char *const TAG = "ade7953";
+
+void ADE7953::dump_config() {
+  ESP_LOGCONFIG(TAG, "ADE7953:");
+  LOG_PIN("  IRQ Pin: ", irq_pin_);
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
+  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
+  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
+  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
+  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
+}
+
+#define ADE_PUBLISH_(name, val, factor) \
+  if (err == i2c::ERROR_OK && this->name##_sensor_) { \
+    float value = (val) / (factor); \
+    this->name##_sensor_->publish_state(value); \
+  }
+#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
+
+void ADE7953::update() {
+  if (!this->is_setup_)
+    return;
+
+  uint32_t val;
+  i2c::ErrorCode err = ade_read_32_(0x0312, &val);
+  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
+  err = ade_read_32_(0x0313, &val);
+  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
+  err = ade_read_32_(0x031A, &val);
+  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
+  err = ade_read_32_(0x031B, &val);
+  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
+  err = ade_read_32_(0x031C, &val);
+  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
+
+  //    auto apparent_power_a = this->ade_read_<int32_t>(0x0310);
+  //    auto apparent_power_b = this->ade_read_<int32_t>(0x0311);
+  //    auto reactive_power_a = this->ade_read_<int32_t>(0x0314);
+  //    auto reactive_power_b = this->ade_read_<int32_t>(0x0315);
+  //    auto power_factor_a = this->ade_read_<int16_t>(0x010A);
+  //    auto power_factor_b = this->ade_read_<int16_t>(0x010B);
+}
+
+}  // namespace ade7953
+}  // namespace esphome

esphome/components/ade7953/ade7953.h

@@ -0,0 +1,97 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+
+#include <vector>
+
+namespace esphome {
+namespace ade7953 {
+
+class ADE7953 : public i2c::I2CDevice, public PollingComponent {
+ public:
+  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
+  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
+  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
+    active_power_a_sensor_ = active_power_a_sensor;
+  }
+  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
+    active_power_b_sensor_ = active_power_b_sensor;
+  }
+
+  void setup() override {
+    if (this->irq_pin_ != nullptr) {
+      this->irq_pin_->setup();
+    }
+    this->set_timeout(100, [this]() {
+      this->ade_write_8_(0x0010, 0x04);
+      this->ade_write_8_(0x00FE, 0xAD);
+      this->ade_write_16_(0x0120, 0x0030);
+      this->is_setup_ = true;
+    });
+  }
+
+  void dump_config() override;
+
+  void update() override;
+
+ protected:
+  i2c::ErrorCode ade_write_8_(uint16_t reg, uint8_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_write_16_(uint16_t reg, uint16_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value >> 8);
+    data.push_back(value >> 0);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_write_32_(uint16_t reg, uint32_t value) {
+    std::vector<uint8_t> data;
+    data.push_back(reg >> 8);
+    data.push_back(reg >> 0);
+    data.push_back(value >> 24);
+    data.push_back(value >> 16);
+    data.push_back(value >> 8);
+    data.push_back(value >> 0);
+    return write(data.data(), data.size());
+  }
+  i2c::ErrorCode ade_read_32_(uint16_t reg, uint32_t *value) {
+    uint8_t reg_data[2];
+    reg_data[0] = reg >> 8;
+    reg_data[1] = reg >> 0;
+    i2c::ErrorCode err = write(reg_data, 2);
+    if (err != i2c::ERROR_OK)
+      return err;
+    uint8_t recv[4];
+    err = read(recv, 4);
+    if (err != i2c::ERROR_OK)
+      return err;
+    *value = 0;
+    *value |= ((uint32_t) recv[0]) << 24;
+    *value |= ((uint32_t) recv[1]) << 16;
+    *value |= ((uint32_t) recv[2]) << 8;
+    *value |= ((uint32_t) recv[3]);
+    return i2c::ERROR_OK;
+  }
+
+  InternalGPIOPin *irq_pin_{nullptr};
+  bool is_setup_{false};
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *current_a_sensor_{nullptr};
+  sensor::Sensor *current_b_sensor_{nullptr};
+  sensor::Sensor *active_power_a_sensor_{nullptr};
+  sensor::Sensor *active_power_b_sensor_{nullptr};
+};
+
+}  // namespace ade7953
+}  // namespace esphome

esphome/components/ade7953/sensor.py

@@ -1,5 +1,90 @@
+import esphome.codegen as cg
 import esphome.config_validation as cv
-
-CONFIG_SCHEMA = cv.invalid(
-    "The ade7953 sensor component has been renamed to ade7953_i2c."
+from esphome.components import sensor, i2c
+from esphome import pins
+from esphome.const import (
+    CONF_ID,
+    CONF_VOLTAGE,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_VOLTAGE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_VOLT,
+    UNIT_AMPERE,
+    UNIT_WATT,
 )
+
+DEPENDENCIES = ["i2c"]
+
+ade7953_ns = cg.esphome_ns.namespace("ade7953")
+ADE7953 = ade7953_ns.class_("ADE7953", cg.PollingComponent, i2c.I2CDevice)
+
+CONF_IRQ_PIN = "irq_pin"
+CONF_CURRENT_A = "current_a"
+CONF_CURRENT_B = "current_b"
+CONF_ACTIVE_POWER_A = "active_power_a"
+CONF_ACTIVE_POWER_B = "active_power_b"
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ADE7953),
+            cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
+            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_VOLT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_VOLTAGE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
+                unit_of_measurement=UNIT_AMPERE,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_CURRENT,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
+                unit_of_measurement=UNIT_AMPERE,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_CURRENT,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
+                unit_of_measurement=UNIT_WATT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_POWER,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
+                unit_of_measurement=UNIT_WATT,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_POWER,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x38))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if CONF_IRQ_PIN in config:
+        irq_pin = await cg.gpio_pin_expression(config[CONF_IRQ_PIN])
+        cg.add(var.set_irq_pin(irq_pin))
+
+    for key in [
+        CONF_VOLTAGE,
+        CONF_CURRENT_A,
+        CONF_CURRENT_B,
+        CONF_ACTIVE_POWER_A,
+        CONF_ACTIVE_POWER_B,
+    ]:
+        if key not in config:
+            continue
+        conf = config[key]
+        sens = await sensor.new_sensor(conf)
+        cg.add(getattr(var, f"set_{key}_sensor")(sens))

esphome/components/ade7953_base/__init__.py

@@ -1,201 +0,0 @@
-from esphome import pins
-import esphome.codegen as cg
-from esphome.components import sensor
-import esphome.config_validation as cv
-from esphome.const import (
-    CONF_FREQUENCY,
-    CONF_IRQ_PIN,
-    CONF_VOLTAGE,
-    CONF_VOLTAGE_GAIN,
-    DEVICE_CLASS_APPARENT_POWER,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_FREQUENCY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_REACTIVE_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_HERTZ,
-    UNIT_PERCENT,
-    UNIT_VOLT,
-    UNIT_VOLT_AMPS,
-    UNIT_VOLT_AMPS_REACTIVE,
-    UNIT_WATT,
-)
-
-CONF_CURRENT_A = "current_a"
-CONF_CURRENT_B = "current_b"
-CONF_ACTIVE_POWER_A = "active_power_a"
-CONF_ACTIVE_POWER_B = "active_power_b"
-CONF_APPARENT_POWER_A = "apparent_power_a"
-CONF_APPARENT_POWER_B = "apparent_power_b"
-CONF_REACTIVE_POWER_A = "reactive_power_a"
-CONF_REACTIVE_POWER_B = "reactive_power_b"
-CONF_POWER_FACTOR_A = "power_factor_a"
-CONF_POWER_FACTOR_B = "power_factor_b"
-CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
-CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
-CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
-CONF_CURRENT_GAIN_A = "current_gain_a"
-CONF_CURRENT_GAIN_B = "current_gain_b"
-CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"
-CONF_ACTIVE_POWER_GAIN_B = "active_power_gain_b"
-CONF_USE_ACCUMULATED_ENERGY_REGISTERS = "use_accumulated_energy_registers"
-PGA_GAINS = {
-    "1x": 0b000,
-    "2x": 0b001,
-    "4x": 0b010,
-    "8x": 0b011,
-    "16x": 0b100,
-    "22x": 0b101,
-}
-
-ade7953_base_ns = cg.esphome_ns.namespace("ade7953_base")
-ADE7953 = ade7953_base_ns.class_("ADE7953", cg.PollingComponent)
-
-ADE7953_CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
-        cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_VOLTAGE,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
-            unit_of_measurement=UNIT_HERTZ,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_FREQUENCY,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_AMPERE,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_CURRENT,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_WATT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_WATT,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_APPARENT_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_APPARENT_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_APPARENT_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_APPARENT_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_REACTIVE_POWER_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_REACTIVE_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_REACTIVE_POWER_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
-            accuracy_decimals=1,
-            device_class=DEVICE_CLASS_REACTIVE_POWER,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_POWER_FACTOR_A): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_POWER_FACTOR,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(CONF_POWER_FACTOR_B): sensor.sensor_schema(
-            unit_of_measurement=UNIT_PERCENT,
-            accuracy_decimals=2,
-            device_class=DEVICE_CLASS_POWER_FACTOR,
-            state_class=STATE_CLASS_MEASUREMENT,
-        ),
-        cv.Optional(
-            CONF_VOLTAGE_PGA_GAIN,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(
-            CONF_CURRENT_PGA_GAIN_A,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(
-            CONF_CURRENT_PGA_GAIN_B,
-            default="1x",
-        ): cv.one_of(*PGA_GAINS, lower=True),
-        cv.Optional(CONF_VOLTAGE_GAIN, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_CURRENT_GAIN_A, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_CURRENT_GAIN_B, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_GAIN_A, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_ACTIVE_POWER_GAIN_B, default=0x400000): cv.hex_int_range(
-            min=0x100000, max=0x800000
-        ),
-        cv.Optional(CONF_USE_ACCUMULATED_ENERGY_REGISTERS, default=False): cv.boolean,
-    }
-).extend(cv.polling_component_schema("60s"))
-
-
-async def register_ade7953(var, config):
-    await cg.register_component(var, config)
-
-    if irq_pin_config := config.get(CONF_IRQ_PIN):
-        irq_pin = await cg.gpio_pin_expression(irq_pin_config)
-        cg.add(var.set_irq_pin(irq_pin))
-
-    cg.add(var.set_pga_v(PGA_GAINS[config.get(CONF_VOLTAGE_PGA_GAIN)]))
-    cg.add(var.set_pga_ia(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_A)]))
-    cg.add(var.set_pga_ib(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_B)]))
-    cg.add(var.set_vgain(config.get(CONF_VOLTAGE_GAIN)))
-    cg.add(var.set_aigain(config.get(CONF_CURRENT_GAIN_A)))
-    cg.add(var.set_bigain(config.get(CONF_CURRENT_GAIN_B)))
-    cg.add(var.set_awgain(config.get(CONF_ACTIVE_POWER_GAIN_A)))
-    cg.add(var.set_bwgain(config.get(CONF_ACTIVE_POWER_GAIN_B)))
-    cg.add(
-        var.set_use_acc_energy_regs(config.get(CONF_USE_ACCUMULATED_ENERGY_REGISTERS))
-    )
-
-    for key in [
-        CONF_VOLTAGE,
-        CONF_FREQUENCY,
-        CONF_CURRENT_A,
-        CONF_CURRENT_B,
-        CONF_POWER_FACTOR_A,
-        CONF_POWER_FACTOR_B,
-        CONF_APPARENT_POWER_A,
-        CONF_APPARENT_POWER_B,
-        CONF_ACTIVE_POWER_A,
-        CONF_ACTIVE_POWER_B,
-        CONF_REACTIVE_POWER_A,
-        CONF_REACTIVE_POWER_B,
-    ]:
-        if key not in config:
-            continue
-        conf = config[key]
-        sens = await sensor.new_sensor(conf)
-        cg.add(getattr(var, f"set_{key}_sensor")(sens))

esphome/components/ade7953_base/ade7953_base.cpp

@@ -1,153 +0,0 @@
-#include "ade7953_base.h"
-#include "esphome/core/log.h"
-
-#include <cinttypes>
-
-namespace esphome {
-namespace ade7953_base {
-
-static const char *const TAG = "ade7953";
-
-static const float ADE_POWER_FACTOR = 154.0f;
-static const float ADE_WATTSEC_POWER_FACTOR = ADE_POWER_FACTOR * ADE_POWER_FACTOR / 3600;
-
-void ADE7953::setup() {
-  if (this->irq_pin_ != nullptr) {
-    this->irq_pin_->setup();
-  }
-
-  // The chip might take up to 100ms to initialise
-  this->set_timeout(100, [this]() {
-    // this->ade_write_8(0x0010, 0x04);
-    this->ade_write_8(0x00FE, 0xAD);
-    this->ade_write_16(0x0120, 0x0030);
-    // Set gains
-    this->ade_write_8(PGA_V_8, pga_v_);
-    this->ade_write_8(PGA_IA_8, pga_ia_);
-    this->ade_write_8(PGA_IB_8, pga_ib_);
-    this->ade_write_32(AVGAIN_32, vgain_);
-    this->ade_write_32(AIGAIN_32, aigain_);
-    this->ade_write_32(BIGAIN_32, bigain_);
-    this->ade_write_32(AWGAIN_32, awgain_);
-    this->ade_write_32(BWGAIN_32, bwgain_);
-    // Read back gains for debugging
-    this->ade_read_8(PGA_V_8, &pga_v_);
-    this->ade_read_8(PGA_IA_8, &pga_ia_);
-    this->ade_read_8(PGA_IB_8, &pga_ib_);
-    this->ade_read_32(AVGAIN_32, &vgain_);
-    this->ade_read_32(AIGAIN_32, &aigain_);
-    this->ade_read_32(BIGAIN_32, &bigain_);
-    this->ade_read_32(AWGAIN_32, &awgain_);
-    this->ade_read_32(BWGAIN_32, &bwgain_);
-    this->last_update_ = millis();
-    this->is_setup_ = true;
-  });
-}
-
-void ADE7953::dump_config() {
-  LOG_PIN("  IRQ Pin: ", irq_pin_);
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
-  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
-  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
-  LOG_SENSOR("  ", "Power Factor A Sensor", this->power_factor_a_sensor_);
-  LOG_SENSOR("  ", "Power Factor B Sensor", this->power_factor_b_sensor_);
-  LOG_SENSOR("  ", "Apparent Power A Sensor", this->apparent_power_a_sensor_);
-  LOG_SENSOR("  ", "Apparent Power B Sensor", this->apparent_power_b_sensor_);
-  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
-  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
-  LOG_SENSOR("  ", "Rective Power A Sensor", this->reactive_power_a_sensor_);
-  LOG_SENSOR("  ", "Reactive Power B Sensor", this->reactive_power_b_sensor_);
-  ESP_LOGCONFIG(TAG,
-                "  USE_ACC_ENERGY_REGS: %d\n"
-                "  PGA_V_8: 0x%X\n"
-                "  PGA_IA_8: 0x%X\n"
-                "  PGA_IB_8: 0x%X\n"
-                "  VGAIN_32: 0x%08jX\n"
-                "  AIGAIN_32: 0x%08jX\n"
-                "  BIGAIN_32: 0x%08jX\n"
-                "  AWGAIN_32: 0x%08jX\n"
-                "  BWGAIN_32: 0x%08jX",
-                this->use_acc_energy_regs_, pga_v_, pga_ia_, pga_ib_, (uintmax_t) vgain_, (uintmax_t) aigain_,
-                (uintmax_t) bigain_, (uintmax_t) awgain_, (uintmax_t) bwgain_);
-}
-
-#define ADE_PUBLISH_(name, val, factor) \
-  if (err == 0 && this->name##_sensor_) { \
-    float value = (val) / (factor); \
-    this->name##_sensor_->publish_state(value); \
-  }
-#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
-
-void ADE7953::update() {
-  if (!this->is_setup_)
-    return;
-
-  bool err;
-
-  uint32_t interrupts_a = 0;
-  uint32_t interrupts_b = 0;
-  if (this->irq_pin_ != nullptr) {
-    // Read and reset interrupts
-    this->ade_read_32(0x032E, &interrupts_a);
-    this->ade_read_32(0x0331, &interrupts_b);
-  }
-
-  uint32_t val;
-  uint16_t val_16;
-  uint16_t reg;
-
-  // Power factor
-  err = this->ade_read_16(0x010A, &val_16);
-  ADE_PUBLISH(power_factor_a, (int16_t) val_16, (0x7FFF / 100.0f));
-  err = this->ade_read_16(0x010B, &val_16);
-  ADE_PUBLISH(power_factor_b, (int16_t) val_16, (0x7FFF / 100.0f));
-
-  float pf = ADE_POWER_FACTOR;
-  if (this->use_acc_energy_regs_) {
-    const uint32_t now = millis();
-    const auto diff = now - this->last_update_;
-    this->last_update_ = now;
-    // prevent DIV/0
-    pf = ADE_WATTSEC_POWER_FACTOR * (diff < 10 ? 10 : diff) / 1000;
-    ESP_LOGVV(TAG, "ADE7953::update() diff=%" PRIu32 " pf=%f", diff, pf);
-  }
-
-  // Apparent power
-  reg = this->use_acc_energy_regs_ ? 0x0322 : 0x0310;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(apparent_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(apparent_power_b, (int32_t) val, pf);
-
-  // Active power
-  reg = this->use_acc_energy_regs_ ? 0x031E : 0x0312;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(active_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(active_power_b, (int32_t) val, pf);
-
-  // Reactive power
-  reg = this->use_acc_energy_regs_ ? 0x0320 : 0x0314;
-  err = this->ade_read_32(reg, &val);
-  ADE_PUBLISH(reactive_power_a, (int32_t) val, pf);
-  err = this->ade_read_32(reg + 1, &val);
-  ADE_PUBLISH(reactive_power_b, (int32_t) val, pf);
-
-  // Current
-  err = this->ade_read_32(0x031A, &val);
-  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
-  err = this->ade_read_32(0x031B, &val);
-  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
-
-  // Voltage
-  err = this->ade_read_32(0x031C, &val);
-  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
-
-  // Frequency
-  err = this->ade_read_16(0x010E, &val_16);
-  ADE_PUBLISH(frequency, 223750.0f, 1 + val_16);
-}
-
-}  // namespace ade7953_base
-}  // namespace esphome

esphome/components/ade7953_base/ade7953_base.h

@@ -1,125 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/sensor/sensor.h"
-
-#include <vector>
-
-namespace esphome {
-namespace ade7953_base {
-
-static const uint8_t PGA_V_8 =
-    0x007;  // PGA_V,  (R/W) Default: 0x00, Unsigned, Voltage channel gain configuration (Bits[2:0])
-static const uint8_t PGA_IA_8 =
-    0x008;  // PGA_IA, (R/W) Default: 0x00, Unsigned, Current Channel A gain configuration (Bits[2:0])
-static const uint8_t PGA_IB_8 =
-    0x009;  // PGA_IB, (R/W) Default: 0x00, Unsigned, Current Channel B gain configuration (Bits[2:0])
-
-static const uint32_t AIGAIN_32 =
-    0x380;  // AIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel A)(32 bit)
-static const uint32_t AVGAIN_32 = 0x381;  // AVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
-static const uint32_t AWGAIN_32 =
-    0x382;  // AWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel A)(32 bit)
-static const uint32_t AVARGAIN_32 =
-    0x383;  // AVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel A)(32 bit)
-static const uint32_t AVAGAIN_32 =
-    0x384;  // AVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel A)(32 bit)
-
-static const uint32_t BIGAIN_32 =
-    0x38C;  // BIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel B)(32 bit)
-static const uint32_t BVGAIN_32 = 0x38D;  // BVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
-static const uint32_t BWGAIN_32 =
-    0x38E;  // BWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel B)(32 bit)
-static const uint32_t BVARGAIN_32 =
-    0x38F;  // BVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel B)(32 bit)
-static const uint32_t BVAGAIN_32 =
-    0x390;  // BVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel B)(32 bit)
-
-class ADE7953 : public PollingComponent, public sensor::Sensor {
- public:
-  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
-
-  // Set PGA input gains: 0 1x, 1 2x, 0b10 4x
-  void set_pga_v(uint8_t pga_v) { pga_v_ = pga_v; }
-  void set_pga_ia(uint8_t pga_ia) { pga_ia_ = pga_ia; }
-  void set_pga_ib(uint8_t pga_ib) { pga_ib_ = pga_ib; }
-
-  // Set input gains
-  void set_vgain(uint32_t vgain) { vgain_ = vgain; }
-  void set_aigain(uint32_t aigain) { aigain_ = aigain; }
-  void set_bigain(uint32_t bigain) { bigain_ = bigain; }
-  void set_awgain(uint32_t awgain) { awgain_ = awgain; }
-  void set_bwgain(uint32_t bwgain) { bwgain_ = bwgain; }
-
-  void set_use_acc_energy_regs(bool use_acc_energy_regs) { use_acc_energy_regs_ = use_acc_energy_regs; }
-
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
-
-  void set_power_factor_a_sensor(sensor::Sensor *power_factor_a) { power_factor_a_sensor_ = power_factor_a; }
-  void set_power_factor_b_sensor(sensor::Sensor *power_factor_b) { power_factor_b_sensor_ = power_factor_b; }
-
-  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
-  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
-
-  void set_apparent_power_a_sensor(sensor::Sensor *apparent_power_a) { apparent_power_a_sensor_ = apparent_power_a; }
-  void set_apparent_power_b_sensor(sensor::Sensor *apparent_power_b) { apparent_power_b_sensor_ = apparent_power_b; }
-
-  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
-    active_power_a_sensor_ = active_power_a_sensor;
-  }
-  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
-    active_power_b_sensor_ = active_power_b_sensor;
-  }
-
-  void set_reactive_power_a_sensor(sensor::Sensor *reactive_power_a) { reactive_power_a_sensor_ = reactive_power_a; }
-  void set_reactive_power_b_sensor(sensor::Sensor *reactive_power_b) { reactive_power_b_sensor_ = reactive_power_b; }
-
-  void setup() override;
-
-  void dump_config() override;
-
-  void update() override;
-
- protected:
-  InternalGPIOPin *irq_pin_{nullptr};
-  bool is_setup_{false};
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *frequency_sensor_{nullptr};
-  sensor::Sensor *current_a_sensor_{nullptr};
-  sensor::Sensor *current_b_sensor_{nullptr};
-  sensor::Sensor *apparent_power_a_sensor_{nullptr};
-  sensor::Sensor *apparent_power_b_sensor_{nullptr};
-  sensor::Sensor *active_power_a_sensor_{nullptr};
-  sensor::Sensor *active_power_b_sensor_{nullptr};
-  sensor::Sensor *reactive_power_a_sensor_{nullptr};
-  sensor::Sensor *reactive_power_b_sensor_{nullptr};
-  sensor::Sensor *power_factor_a_sensor_{nullptr};
-  sensor::Sensor *power_factor_b_sensor_{nullptr};
-  uint8_t pga_v_;
-  uint8_t pga_ia_;
-  uint8_t pga_ib_;
-  uint32_t vgain_;
-  uint32_t aigain_;
-  uint32_t bigain_;
-  uint32_t awgain_;
-  uint32_t bwgain_;
-  bool use_acc_energy_regs_{false};
-  uint32_t last_update_;
-
-  virtual bool ade_write_8(uint16_t reg, uint8_t value) = 0;
-
-  virtual bool ade_write_16(uint16_t reg, uint16_t value) = 0;
-
-  virtual bool ade_write_32(uint16_t reg, uint32_t value) = 0;
-
-  virtual bool ade_read_8(uint16_t reg, uint8_t *value) = 0;
-
-  virtual bool ade_read_16(uint16_t reg, uint16_t *value) = 0;
-
-  virtual bool ade_read_32(uint16_t reg, uint32_t *value) = 0;
-};
-
-}  // namespace ade7953_base
-}  // namespace esphome

esphome/components/ade7953_i2c/__init__.py

@@ -1 +0,0 @@
-CODEOWNERS = ["@angelnu"]

esphome/components/ade7953_i2c/ade7953_i2c.cpp

@@ -1,80 +0,0 @@
-#include "ade7953_i2c.h"
-#include "esphome/core/helpers.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ade7953_i2c {
-
-static const char *const TAG = "ade7953";
-
-void AdE7953I2c::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7953_i2c:");
-  LOG_I2C_DEVICE(this);
-  ade7953_base::ADE7953::dump_config();
-}
-bool AdE7953I2c::ade_write_8(uint16_t reg, uint8_t value) {
-  uint8_t data[3];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value;
-  return this->write(data, 3) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_16(uint16_t reg, uint16_t value) {
-  uint8_t data[4];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value >> 8;
-  data[3] = value >> 0;
-  return this->write(data, 4) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_write_32(uint16_t reg, uint32_t value) {
-  uint8_t data[6];
-  data[0] = reg >> 8;
-  data[1] = reg >> 0;
-  data[2] = value >> 24;
-  data[3] = value >> 16;
-  data[4] = value >> 8;
-  data[5] = value >> 0;
-  return this->write(data, 6) != i2c::ERROR_OK;
-}
-bool AdE7953I2c::ade_read_8(uint16_t reg, uint8_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  err = this->read(value, 1);
-  return (err != i2c::ERROR_OK);
-}
-bool AdE7953I2c::ade_read_16(uint16_t reg, uint16_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  uint8_t recv[2];
-  err = this->read(recv, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  *value = encode_uint16(recv[0], recv[1]);
-  return false;
-}
-bool AdE7953I2c::ade_read_32(uint16_t reg, uint32_t *value) {
-  uint8_t reg_data[2];
-  reg_data[0] = reg >> 8;
-  reg_data[1] = reg >> 0;
-  i2c::ErrorCode err = this->write(reg_data, 2);
-  if (err != i2c::ERROR_OK)
-    return true;
-  uint8_t recv[4];
-  err = this->read(recv, 4);
-  if (err != i2c::ERROR_OK)
-    return true;
-  *value = encode_uint32(recv[0], recv[1], recv[2], recv[3]);
-  return false;
-}
-
-}  // namespace ade7953_i2c
-}  // namespace esphome