Merge remote-tracking branch 'upstream/dev' into openthread

.dockerignore

@@ -75,6 +75,9 @@ target/
 # pyenv
 .python-version
 
+# asdf
+.tool-versions
+
 # celery beat schedule file
 celerybeat-schedule
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,11 +7,16 @@
 - [ ] 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):** fixes <link to issue>
+**Related issue or feature (if applicable):**
 
-**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here>
+- 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>
 
 ## Test Environment
 
@@ -23,12 +28,6 @@
 - [ ] RTL87xx
 
 ## 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/restore-python/action.yml

@@ -17,12 +17,12 @@ runs:
   steps:
     - name: Set up Python ${{ inputs.python-version }}
       id: python
-      uses: actions/setup-python@v5.2.0
+      uses: actions/setup-python@v5.3.0
       with:
         python-version: ${{ inputs.python-version }}
     - name: Restore Python virtual environment
       id: cache-venv
-      uses: actions/cache/restore@v4.1.1
+      uses: actions/cache/restore@v4.1.2
       with:
         path: venv
         # yamllint disable-line rule:line-length

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

@@ -23,7 +23,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: "3.11"
 

.github/workflows/ci-docker.yml

@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: "3.9"
       - name: Set up Docker Buildx

.github/workflows/ci.yml

@@ -41,12 +41,12 @@ jobs:
         run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.1.2
         with:
           path: venv
           # yamllint disable-line rule:line-length
@@ -219,7 +219,7 @@ jobs:
           . venv/bin/activate
           pytest -vv --cov-report=xml --tb=native tests
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
@@ -302,14 +302,14 @@ jobs:
 
       - name: Cache platformio
         if: github.ref == 'refs/heads/dev'
-        uses: actions/cache@v4.1.1
+        uses: actions/cache@v4.1.2
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}
 
       - name: Cache platformio
         if: github.ref != 'refs/heads/dev'
-        uses: actions/cache/restore@v4.1.1
+        uses: actions/cache/restore@v4.1.2
         with:
           path: ~/.platformio
           key: platformio-${{ matrix.pio_cache_key }}

.github/workflows/release.yml

@@ -53,7 +53,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: "3.x"
       - name: Set up python environment
@@ -65,7 +65,7 @@ jobs:
           pip3 install build
           python3 -m build
       - name: Publish
-        uses: pypa/gh-action-pypi-publish@v1.10.3
+        uses: pypa/gh-action-pypi-publish@v1.12.2
 
   deploy-docker:
     name: Build ESPHome ${{ matrix.platform }}
@@ -85,7 +85,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.7
       - name: Set up Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: "3.9"
 

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

@@ -22,7 +22,7 @@ jobs:
           path: lib/home-assistant
 
       - name: Setup Python
-        uses: actions/setup-python@v5.2.0
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: 3.12
 

.gitignore

@@ -75,6 +75,9 @@ cov.xml
 # pyenv
 .python-version
 
+# asdf
+.tool-versions
+
 # Environments
 .env
 .venv

CODEOWNERS

@@ -85,6 +85,7 @@ esphome/components/bmp581/* @kahrendt
 esphome/components/bp1658cj/* @Cossid
 esphome/components/bp5758d/* @Cossid
 esphome/components/button/* @esphome/core
+esphome/components/bytebuffer/* @clydebarrow
 esphome/components/canbus/* @danielschramm @mvturnho
 esphome/components/cap1188/* @mreditor97
 esphome/components/captive_portal/* @OttoWinter
@@ -130,6 +131,7 @@ esphome/components/ens160_base/* @latonita @vincentscode
 esphome/components/ens160_i2c/* @latonita
 esphome/components/ens160_spi/* @latonita
 esphome/components/ens210/* @itn3rd77
+esphome/components/es8311/* @kahrendt @kroimon
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @Rapsssito @jesserockz
 esphome/components/esp32_ble_client/* @jesserockz
@@ -198,10 +200,11 @@ 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
+esphome/components/i2s_audio/speaker/* @jesserockz @kahrendt
 esphome/components/iaqcore/* @yozik04
 esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
@@ -377,7 +380,7 @@ esphome/components/smt100/* @piechade
 esphome/components/sn74hc165/* @jesserockz
 esphome/components/socket/* @esphome/core
 esphome/components/sonoff_d1/* @anatoly-savchenkov
-esphome/components/speaker/* @jesserockz
+esphome/components/speaker/* @jesserockz @kahrendt
 esphome/components/spi/* @clydebarrow @esphome/core
 esphome/components/spi_device/* @clydebarrow
 esphome/components/spi_led_strip/* @clydebarrow

docker/Dockerfile

@@ -32,33 +32,14 @@ RUN \
         python3-setuptools=66.1.1-1 \
         python3-venv=3.11.2-1+b1 \
         python3-wheel=0.38.4-2 \
-        iputils-ping=3:20221126-1 \
+        iputils-ping=3:20221126-1+deb12u1 \
         git=1:2.39.5-0+deb12u1 \
-        curl=7.88.1-10+deb12u7 \
+        curl=7.88.1-10+deb12u8 \
         openssh-client=1:9.2p1-2+deb12u3 \
         python3-cffi=1.15.1-5 \
         libcairo2=1.16.0-7 \
         libmagic1=1:5.44-3 \
         patch=2.7.6-7 \
-    && ( \
-        ( \
-            [ "$TARGETARCH$TARGETVARIANT" = "armv7" ] && \
-                apt-get install -y --no-install-recommends \
-                build-essential=12.9 \
-                python3-dev=3.11.2-1+b1 \
-                zlib1g-dev=1:1.2.13.dfsg-1 \
-                libjpeg-dev=1:2.1.5-2 \
-                libfreetype-dev=2.12.1+dfsg-5+deb12u3 \
-                libssl-dev=3.0.14-1~deb12u2 \
-                libffi-dev=3.4.4-1 \
-                libopenjp2-7=2.5.0-2 \
-                libtiff6=4.5.0-6+deb12u1 \
-                cargo=0.66.0+ds1-1 \
-                pkg-config=1.8.1-1 \
-                gcc-arm-linux-gnueabihf=4:12.2.0-3 \
-        ) \
-        || [ "$TARGETARCH$TARGETVARIANT" != "armv7" ] \
-    ) \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -97,15 +78,48 @@ RUN \
 # tmpfs is for https://github.com/rust-lang/cargo/issues/8719
 
 COPY requirements.txt requirements_optional.txt /
-RUN --mount=type=tmpfs,target=/root/.cargo if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
+RUN --mount=type=tmpfs,target=/root/.cargo <<END-OF-RUN
-        curl -L https://www.piwheels.org/cp311/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl -o /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+# Fail on any non-zero status
-        && pip3 install --break-system-packages --no-cache-dir /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+set -e
-        && rm /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl \
+
-        && export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple"; \
+if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]
-    fi; \
+then
-    CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse CARGO_HOME=/root/.cargo \
+    curl -L https://www.piwheels.org/cp311/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl -o /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl
-    pip3 install \
+    pip3 install --break-system-packages --no-cache-dir /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl
-    --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt
+    rm /tmp/cryptography-43.0.0-cp37-abi3-linux_armv7l.whl
+    export PIP_EXTRA_INDEX_URL="https://www.piwheels.org/simple";
+fi
+
+# install build tools in case wheels are not available
+BUILD_DEPS="
+    build-essential=12.9
+    python3-dev=3.11.2-1+b1
+    zlib1g-dev=1:1.2.13.dfsg-1
+    libjpeg-dev=1:2.1.5-2
+    libfreetype-dev=2.12.1+dfsg-5+deb12u3
+    libssl-dev=3.0.15-1~deb12u1
+    libffi-dev=3.4.4-1
+    libopenjp2-7=2.5.0-2
+    libtiff6=4.5.0-6+deb12u1
+    cargo=0.66.0+ds1-1
+    pkg-config=1.8.1-1
+"
+if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ] || [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]
+then
+    apt-get update
+    apt-get install -y --no-install-recommends $BUILD_DEPS
+fi
+
+CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse CARGO_HOME=/root/.cargo
+pip3 install --break-system-packages --no-cache-dir -r /requirements.txt -r /requirements_optional.txt
+
+if [ "$TARGETARCH$TARGETVARIANT" = "arm64" ] || [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]
+then
+    apt-get remove -y --purge --auto-remove $BUILD_DEPS
+    rm -rf /tmp/* /var/{cache,log}/* /var/lib/apt/lists/*
+fi
+END-OF-RUN
+
 
 COPY script/platformio_install_deps.py platformio.ini /
 RUN /platformio_install_deps.py /platformio.ini --libraries

esphome/__main__.py

@@ -20,6 +20,8 @@ from esphome.const import (
     CONF_DEASSERT_RTS_DTR,
     CONF_DISABLED,
     CONF_ESPHOME,
+    CONF_LEVEL,
+    CONF_LOG_TOPIC,
     CONF_LOGGER,
     CONF_MDNS,
     CONF_MQTT,
@@ -30,6 +32,7 @@ from esphome.const import (
     CONF_PLATFORMIO_OPTIONS,
     CONF_PORT,
     CONF_SUBSTITUTIONS,
+    CONF_TOPIC,
     PLATFORM_BK72XX,
     PLATFORM_ESP32,
     PLATFORM_ESP8266,
@@ -38,7 +41,7 @@ from esphome.const import (
     SECRETS_FILES,
 )
 from esphome.core import CORE, EsphomeError, coroutine
-from esphome.helpers import indent, is_ip_address, get_bool_env
+from esphome.helpers import get_bool_env, indent, is_ip_address
 from esphome.log import Fore, color, setup_log
 from esphome.util import (
     get_serial_ports,
@@ -95,8 +98,12 @@ def choose_upload_log_host(
         options.append((f"Over The Air ({CORE.address})", CORE.address))
         if default == "OTA":
             return CORE.address
-    if show_mqtt and CONF_MQTT in CORE.config:
+    if (
-        options.append((f"MQTT ({CORE.config['mqtt'][CONF_BROKER]})", "MQTT"))
+        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 default == "OTA":
             return "MQTT"
     if default is not None:
@@ -106,6 +113,17 @@ def choose_upload_log_host(
     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
+
+
 def get_port_type(port):
     if port.startswith("/") or port.startswith("COM"):
         return "SERIAL"
@@ -378,7 +396,7 @@ def show_logs(config, args, port):
 
             port = mqtt.get_esphome_device_ip(
                 config, args.username, args.password, args.client_id
-            )
+            )[0]
 
         from esphome.components.api.client import run_logs
 

esphome/components/animation/__init__.py

@@ -271,7 +271,8 @@ async def to_code(config):
                 pos += 1
 
     elif config[CONF_TYPE] in ["RGB565", "TRANSPARENT_IMAGE"]:
-        data = [0 for _ in range(height * width * 2 * frames)]
+        bytes_per_pixel = 3 if transparent else 2
+        data = [0 for _ in range(height * width * bytes_per_pixel * frames)]
         pos = 0
         for frameIndex in range(frames):
             image.seek(frameIndex)
@@ -288,17 +289,13 @@ async def to_code(config):
                 G = g >> 2
                 B = b >> 3
                 rgb = (R << 11) | (G << 5) | B
-
-                if transparent:
-                    if rgb == 0x0020:
-                        rgb = 0
-                    if a < 0x80:
-                        rgb = 0x0020
-
                 data[pos] = rgb >> 8
                 pos += 1
                 data[pos] = rgb & 0xFF
                 pos += 1
+                if transparent:
+                    data[pos] = a
+                    pos += 1
 
     elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
         width8 = ((width + 7) // 8) * 8

esphome/components/animation/animation.cpp

@@ -62,7 +62,7 @@ void Animation::set_frame(int frame) {
 }
 
 void Animation::update_data_start_() {
-  const uint32_t image_size = image_type_to_width_stride(this->width_, this->type_) * this->height_;
+  const uint32_t image_size = this->get_width_stride() * this->height_;
   this->data_start_ = this->animation_data_start_ + image_size * this->current_frame_;
 }
 

esphome/components/ble_rssi/sensor.py

@@ -45,7 +45,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_SERVICE_UUID): esp32_ble_tracker.bt_uuid,
             cv.Optional(CONF_IBEACON_MAJOR): cv.uint16_t,
             cv.Optional(CONF_IBEACON_MINOR): cv.uint16_t,
-            cv.Optional(CONF_IBEACON_UUID): cv.uuid,
+            cv.Optional(CONF_IBEACON_UUID): esp32_ble_tracker.bt_uuid,
         }
     )
     .extend(esp32_ble_tracker.ESP_BLE_DEVICE_SCHEMA)
@@ -79,7 +79,7 @@ async def to_code(config):
             cg.add(var.set_service_uuid128(uuid128))
 
     if ibeacon_uuid := config.get(CONF_IBEACON_UUID):
-        ibeacon_uuid = esp32_ble_tracker.as_hex_array(str(ibeacon_uuid))
+        ibeacon_uuid = esp32_ble_tracker.as_reversed_hex_array(ibeacon_uuid)
         cg.add(var.set_ibeacon_uuid(ibeacon_uuid))
 
         if (ibeacon_major := config.get(CONF_IBEACON_MAJOR)) is not None:

esphome/components/bme68x_bsec2/bme68x_bsec2.cpp

@@ -204,11 +204,11 @@ void BME68xBSEC2Component::update_subscription_() {
 }
 
 void BME68xBSEC2Component::run_() {
+  this->op_mode_ = this->bsec_settings_.op_mode;
   int64_t curr_time_ns = this->get_time_ns_();
-  if (curr_time_ns < this->next_call_ns_) {
+  if (curr_time_ns < this->bsec_settings_.next_call) {
     return;
   }
-  this->op_mode_ = this->bsec_settings_.op_mode;
   uint8_t status;
 
   ESP_LOGV(TAG, "Performing sensor run");
@@ -219,57 +219,60 @@ void BME68xBSEC2Component::run_() {
     ESP_LOGW(TAG, "Failed to fetch sensor control settings (BSEC2 error code %d)", this->bsec_status_);
     return;
   }
-  this->next_call_ns_ = this->bsec_settings_.next_call;
 
-  if (this->bsec_settings_.trigger_measurement) {
+  switch (this->bsec_settings_.op_mode) {
-    bme68x_get_conf(&bme68x_conf, &this->bme68x_);
+    case BME68X_FORCED_MODE:
+      bme68x_get_conf(&bme68x_conf, &this->bme68x_);
 
-    bme68x_conf.os_hum = this->bsec_settings_.humidity_oversampling;
+      bme68x_conf.os_hum = this->bsec_settings_.humidity_oversampling;
-    bme68x_conf.os_temp = this->bsec_settings_.temperature_oversampling;
+      bme68x_conf.os_temp = this->bsec_settings_.temperature_oversampling;
-    bme68x_conf.os_pres = this->bsec_settings_.pressure_oversampling;
+      bme68x_conf.os_pres = this->bsec_settings_.pressure_oversampling;
-    bme68x_set_conf(&bme68x_conf, &this->bme68x_);
+      bme68x_set_conf(&bme68x_conf, &this->bme68x_);
+      this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
+      this->bme68x_heatr_conf_.heatr_temp = this->bsec_settings_.heater_temperature;
+      this->bme68x_heatr_conf_.heatr_dur = this->bsec_settings_.heater_duration;
+
+      // status = bme68x_set_op_mode(this->bsec_settings_.op_mode, &this->bme68x_);
+      status = bme68x_set_heatr_conf(BME68X_FORCED_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
+      status = bme68x_set_op_mode(BME68X_FORCED_MODE, &this->bme68x_);
+      this->op_mode_ = BME68X_FORCED_MODE;
+      ESP_LOGV(TAG, "Using forced mode");
+
+      break;
+    case BME68X_PARALLEL_MODE:
+      if (this->op_mode_ != this->bsec_settings_.op_mode) {
+        bme68x_get_conf(&bme68x_conf, &this->bme68x_);
+
+        bme68x_conf.os_hum = this->bsec_settings_.humidity_oversampling;
+        bme68x_conf.os_temp = this->bsec_settings_.temperature_oversampling;
+        bme68x_conf.os_pres = this->bsec_settings_.pressure_oversampling;
+        bme68x_set_conf(&bme68x_conf, &this->bme68x_);
 
-    switch (this->bsec_settings_.op_mode) {
-      case BME68X_FORCED_MODE:
         this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
-        this->bme68x_heatr_conf_.heatr_temp = this->bsec_settings_.heater_temperature;
+        this->bme68x_heatr_conf_.heatr_temp_prof = this->bsec_settings_.heater_temperature_profile;
-        this->bme68x_heatr_conf_.heatr_dur = this->bsec_settings_.heater_duration;
+        this->bme68x_heatr_conf_.heatr_dur_prof = this->bsec_settings_.heater_duration_profile;
+        this->bme68x_heatr_conf_.profile_len = this->bsec_settings_.heater_profile_len;
+        this->bme68x_heatr_conf_.shared_heatr_dur =
+            BSEC_TOTAL_HEAT_DUR -
+            (bme68x_get_meas_dur(BME68X_PARALLEL_MODE, &bme68x_conf, &this->bme68x_) / INT64_C(1000));
 
-        status = bme68x_set_op_mode(this->bsec_settings_.op_mode, &this->bme68x_);
+        status = bme68x_set_heatr_conf(BME68X_PARALLEL_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
-        status = bme68x_set_heatr_conf(BME68X_FORCED_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
-        status = bme68x_set_op_mode(BME68X_FORCED_MODE, &this->bme68x_);
-        this->op_mode_ = BME68X_FORCED_MODE;
-        this->sleep_mode_ = false;
-        ESP_LOGV(TAG, "Using forced mode");
 
-        break;
+        status = bme68x_set_op_mode(BME68X_PARALLEL_MODE, &this->bme68x_);
-      case BME68X_PARALLEL_MODE:
+        this->op_mode_ = BME68X_PARALLEL_MODE;
-        if (this->op_mode_ != this->bsec_settings_.op_mode) {
+        ESP_LOGV(TAG, "Using parallel mode");
-          this->bme68x_heatr_conf_.enable = BME68X_ENABLE;
+      }
-          this->bme68x_heatr_conf_.heatr_temp_prof = this->bsec_settings_.heater_temperature_profile;
+      break;
-          this->bme68x_heatr_conf_.heatr_dur_prof = this->bsec_settings_.heater_duration_profile;
+    case BME68X_SLEEP_MODE:
-          this->bme68x_heatr_conf_.profile_len = this->bsec_settings_.heater_profile_len;
+      if (this->op_mode_ != this->bsec_settings_.op_mode) {
-          this->bme68x_heatr_conf_.shared_heatr_dur =
+        bme68x_set_op_mode(BME68X_SLEEP_MODE, &this->bme68x_);
-              BSEC_TOTAL_HEAT_DUR -
+        this->op_mode_ = BME68X_SLEEP_MODE;
-              (bme68x_get_meas_dur(BME68X_PARALLEL_MODE, &bme68x_conf, &this->bme68x_) / INT64_C(1000));
+        ESP_LOGV(TAG, "Using sleep mode");
-
+      }
-          status = bme68x_set_heatr_conf(BME68X_PARALLEL_MODE, &this->bme68x_heatr_conf_, &this->bme68x_);
+      break;
-
+  }
-          status = bme68x_set_op_mode(BME68X_PARALLEL_MODE, &this->bme68x_);
-          this->op_mode_ = BME68X_PARALLEL_MODE;
-          this->sleep_mode_ = false;
-          ESP_LOGV(TAG, "Using parallel mode");
-        }
-        break;
-      case BME68X_SLEEP_MODE:
-        if (!this->sleep_mode_) {
-          bme68x_set_op_mode(BME68X_SLEEP_MODE, &this->bme68x_);
-          this->sleep_mode_ = true;
-          ESP_LOGV(TAG, "Using sleep mode");
-        }
-        break;
-    }
 
+  if (this->bsec_settings_.trigger_measurement && this->bsec_settings_.op_mode != BME68X_SLEEP_MODE) {
     uint32_t meas_dur = 0;
     meas_dur = bme68x_get_meas_dur(this->op_mode_, &bme68x_conf, &this->bme68x_);
     ESP_LOGV(TAG, "Queueing read in %uus", meas_dur);

esphome/components/bme68x_bsec2/bme68x_bsec2.h

@@ -113,13 +113,11 @@ class BME68xBSEC2Component : public Component {
 
   struct bme68x_heatr_conf bme68x_heatr_conf_;
   uint8_t op_mode_;  // operating mode of sensor
-  bool sleep_mode_;
   bsec_library_return_t bsec_status_{BSEC_OK};
   int8_t bme68x_status_{BME68X_OK};
 
   int64_t last_time_ms_{0};
   uint32_t millis_overflow_counter_{0};
-  int64_t next_call_ns_{0};
 
   std::queue<std::function<void()>> queue_;
 

esphome/components/bytebuffer/__init__.py

@@ -0,0 +1,5 @@
+CODEOWNERS = ["@clydebarrow"]
+
+# Allows bytebuffer to be configured in yaml, to allow use of the C++ api.
+
+CONFIG_SCHEMA = {}

esphome/components/bytebuffer/bytebuffer.h

@@ -0,0 +1,421 @@
+#pragma once
+
+#include <utility>
+#include <vector>
+#include <cinttypes>
+#include <cstddef>
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace bytebuffer {
+
+enum Endian { LITTLE, BIG };
+
+/**
+ * A class modelled on the Java ByteBuffer class. It wraps a vector of bytes and permits putting and getting
+ * items of various sizes, with an automatically incremented position.
+ *
+ * There are three variables maintained pointing into the buffer:
+ *
+ * capacity: the maximum amount of data that can be stored - set on construction and cannot be changed
+ * limit: the limit of the data currently available to get or put
+ * position: the current insert or extract position
+ *
+ * 0 <= position <= limit <= capacity
+ *
+ * In addition a mark can be set to the current position with mark(). A subsequent call to reset() will restore
+ * the position to the mark.
+ *
+ * The buffer can be marked to be little-endian (default) or big-endian. All subsequent operations will use that order.
+ *
+ * The flip() operation will reset the position to 0 and limit to the current position. This is useful for reading
+ * data from a buffer after it has been written.
+ *
+ * The code is defined here in the header file rather than in a .cpp file, so that it does not get compiled if not used.
+ * The templated functions ensure that only those typed functions actually used are compiled. The functions
+ * are implicitly inline-able which will aid performance.
+ */
+class ByteBuffer {
+ public:
+  // Default constructor (compatibility with TEMPLATABLE_VALUE)
+  // Creates a zero-length ByteBuffer which is little use to anybody.
+  ByteBuffer() : ByteBuffer(std::vector<uint8_t>()) {}
+
+  /**
+   * Create a new Bytebuffer with the given capacity
+   */
+  ByteBuffer(size_t capacity, Endian endianness = LITTLE)
+      : data_(std::vector<uint8_t>(capacity)), endianness_(endianness), limit_(capacity){};
+
+  // templated functions to implement putting and getting data of various types. There are two flavours of all
+  // functions - one that uses the position as the offset, and updates the position accordingly, and one that
+  // takes an explicit offset and does not update the position.
+  // Separate temnplates are provided for types that fit into 32 bits and those that are bigger. These delegate
+  // the actual put/get to common code based around those sizes.
+  // This reduces the code size and execution time for smaller types. A similar structure for e.g. 16 bits is unlikely
+  // to provide any further benefit given that all target platforms are native 32 bit.
+
+  template<typename T>
+  T get(typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    // integral types that fit into 32 bit
+    return static_cast<T>(this->get_uint32_(sizeof(T)));
+  }
+
+  template<typename T>
+  T get(size_t offset, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    return static_cast<T>(this->get_uint32_(offset, sizeof(T)));
+  }
+
+  template<typename T>
+  void put(const T &value, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    this->put_uint32_(static_cast<uint32_t>(value), sizeof(T));
+  }
+
+  template<typename T>
+  void put(const T &value, size_t offset, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    this->put_uint32_(static_cast<uint32_t>(value), offset, sizeof(T));
+  }
+
+  // integral types that do not fit into 32 bit (basically only 64 bit types)
+  template<typename T>
+  T get(typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    return static_cast<T>(this->get_uint64_(sizeof(T)));
+  }
+
+  template<typename T>
+  T get(size_t offset, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    return static_cast<T>(this->get_uint64_(offset, sizeof(T)));
+  }
+
+  template<typename T>
+  void put(const T &value, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    this->put_uint64_(value, sizeof(T));
+  }
+
+  template<typename T>
+  void put(const T &value, size_t offset, typename std::enable_if<std::is_integral<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    this->put_uint64_(static_cast<uint64_t>(value), offset, sizeof(T));
+  }
+
+  // floating point types. Caters for 32 and 64 bit floating point.
+  template<typename T>
+  T get(typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint32_t)), T>::type * = 0) {
+    return bit_cast<T>(this->get_uint32_(sizeof(T)));
+  }
+
+  template<typename T>
+  T get(typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    return bit_cast<T>(this->get_uint64_(sizeof(T)));
+  }
+
+  template<typename T>
+  T get(size_t offset, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint32_t)), T>::type * = 0) {
+    return bit_cast<T>(this->get_uint32_(offset, sizeof(T)));
+  }
+
+  template<typename T>
+  T get(size_t offset, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+        typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    return bit_cast<T>(this->get_uint64_(offset, sizeof(T)));
+  }
+  template<typename T>
+  void put(const T &value, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    this->put_uint32_(bit_cast<uint32_t>(value), sizeof(T));
+  }
+
+  template<typename T>
+  void put(const T &value, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    this->put_uint64_(bit_cast<uint64_t>(value), sizeof(T));
+  }
+
+  template<typename T>
+  void put(const T &value, size_t offset, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) <= sizeof(uint32_t)), T>::type * = 0) {
+    this->put_uint32_(bit_cast<uint32_t>(value), offset, sizeof(T));
+  }
+
+  template<typename T>
+  void put(const T &value, size_t offset, typename std::enable_if<std::is_floating_point<T>::value, T>::type * = 0,
+           typename std::enable_if<(sizeof(T) == sizeof(uint64_t)), T>::type * = 0) {
+    this->put_uint64_(bit_cast<uint64_t>(value), offset, sizeof(T));
+  }
+
+  template<typename T> static ByteBuffer wrap(T value, Endian endianness = LITTLE) {
+    ByteBuffer buffer = ByteBuffer(sizeof(T), endianness);
+    buffer.put(value);
+    buffer.flip();
+    return buffer;
+  }
+
+  static ByteBuffer wrap(std::vector<uint8_t> const &data, Endian endianness = LITTLE) {
+    ByteBuffer buffer = {data};
+    buffer.endianness_ = endianness;
+    return buffer;
+  }
+
+  static ByteBuffer wrap(const uint8_t *ptr, size_t len, Endian endianness = LITTLE) {
+    return wrap(std::vector<uint8_t>(ptr, ptr + len), endianness);
+  }
+
+  // convenience functions with explicit types named..
+  void put_float(float value) { this->put(value); }
+  void put_double(double value) { this->put(value); }
+
+  uint8_t get_uint8() { return this->data_[this->position_++]; }
+  // Get a 16 bit unsigned value, increment by 2
+  uint16_t get_uint16() { return this->get<uint16_t>(); }
+  // Get a 24 bit unsigned value, increment by 3
+  uint32_t get_uint24() { return this->get_uint32_(3); };
+  // Get a 32 bit unsigned value, increment by 4
+  uint32_t get_uint32() { return this->get<uint32_t>(); };
+  // Get a 64 bit unsigned value, increment by 8
+  uint64_t get_uint64() { return this->get<uint64_t>(); };
+  // Signed versions of the get functions
+  uint8_t get_int8() { return static_cast<int8_t>(this->get_uint8()); };
+  int16_t get_int16() { return this->get<uint16_t>(); }
+  int32_t get_int32() { return this->get<int32_t>(); }
+  int64_t get_int64() { return this->get<int64_t>(); }
+  // Get a float value, increment by 4
+  float get_float() { return this->get<float>(); }
+  // Get a double value, increment by 8
+  double get_double() { return this->get<double>(); }
+
+  // Get a bool value, increment by 1
+  bool get_bool() { return static_cast<bool>(this->get_uint8()); }
+
+  uint32_t get_int24(size_t offset) {
+    auto value = this->get_uint24(offset);
+    uint32_t mask = (~static_cast<uint32_t>(0)) << 23;
+    if ((value & mask) != 0)
+      value |= mask;
+    return value;
+  }
+
+  uint32_t get_int24() {
+    auto value = this->get_uint24();
+    uint32_t mask = (~static_cast<uint32_t>(0)) << 23;
+    if ((value & mask) != 0)
+      value |= mask;
+    return value;
+  }
+  std::vector<uint8_t> get_vector(size_t length, size_t offset) {
+    auto start = this->data_.begin() + offset;
+    return {start, start + length};
+  }
+
+  std::vector<uint8_t> get_vector(size_t length) {
+    auto result = this->get_vector(length, this->position_);
+    this->position_ += length;
+    return result;
+  }
+
+  // Convenience named functions
+  void put_uint8(uint8_t value) { this->data_[this->position_++] = value; }
+  void put_uint16(uint16_t value) { this->put(value); }
+  void put_uint24(uint32_t value) { this->put_uint32_(value, 3); }
+  void put_uint32(uint32_t value) { this->put(value); }
+  void put_uint64(uint64_t value) { this->put(value); }
+  // Signed versions of the put functions
+  void put_int8(int8_t value) { this->put_uint8(static_cast<uint8_t>(value)); }
+  void put_int16(int16_t value) { this->put(value); }
+  void put_int24(int32_t value) { this->put_uint32_(value, 3); }
+  void put_int32(int32_t value) { this->put(value); }
+  void put_int64(int64_t value) { this->put(value); }
+  // Extra put functions
+  void put_bool(bool value) { this->put_uint8(value); }
+
+  // versions of the above with an offset, these do not update the position
+
+  uint64_t get_uint64(size_t offset) { return this->get<uint64_t>(offset); }
+  uint32_t get_uint24(size_t offset) { return this->get_uint32_(offset, 3); };
+  double get_double(size_t offset) { return get<double>(offset); }
+
+  // Get one byte from the buffer, increment position by 1
+  uint8_t get_uint8(size_t offset) { return this->data_[offset]; }
+  // Get a 16 bit unsigned value, increment by 2
+  uint16_t get_uint16(size_t offset) { return get<uint16_t>(offset); }
+  // Get a 24 bit unsigned value, increment by 3
+  uint32_t get_uint32(size_t offset) { return this->get<uint32_t>(offset); };
+  // Get a 64 bit unsigned value, increment by 8
+  uint8_t get_int8(size_t offset) { return get<int8_t>(offset); }
+  int16_t get_int16(size_t offset) { return get<int16_t>(offset); }
+  int32_t get_int32(size_t offset) { return get<int32_t>(offset); }
+  int64_t get_int64(size_t offset) { return get<int64_t>(offset); }
+  // Get a float value, increment by 4
+  float get_float(size_t offset) { return get<float>(offset); }
+  // Get a double value, increment by 8
+
+  // Get a bool value, increment by 1
+  bool get_bool(size_t offset) { return this->get_uint8(offset); }
+
+  void put_uint8(uint8_t value, size_t offset) { this->data_[offset] = value; }
+  void put_uint16(uint16_t value, size_t offset) { this->put(value, offset); }
+  void put_uint24(uint32_t value, size_t offset) { this->put(value, offset); }
+  void put_uint32(uint32_t value, size_t offset) { this->put(value, offset); }
+  void put_uint64(uint64_t value, size_t offset) { this->put(value, offset); }
+  // Signed versions of the put functions
+  void put_int8(int8_t value, size_t offset) { this->put_uint8(static_cast<uint8_t>(value), offset); }
+  void put_int16(int16_t value, size_t offset) { this->put(value, offset); }
+  void put_int24(int32_t value, size_t offset) { this->put_uint32_(value, offset, 3); }
+  void put_int32(int32_t value, size_t offset) { this->put(value, offset); }
+  void put_int64(int64_t value, size_t offset) { this->put(value, offset); }
+  // Extra put functions
+  void put_float(float value, size_t offset) { this->put(value, offset); }
+  void put_double(double value, size_t offset) { this->put(value, offset); }
+  void put_bool(bool value, size_t offset) { this->put_uint8(value, offset); }
+  void put(const std::vector<uint8_t> &value, size_t offset) {
+    std::copy(value.begin(), value.end(), this->data_.begin() + offset);
+  }
+  void put_vector(const std::vector<uint8_t> &value, size_t offset) { this->put(value, offset); }
+  void put(const std::vector<uint8_t> &value) {
+    this->put_vector(value, this->position_);
+    this->position_ += value.size();
+  }
+  void put_vector(const std::vector<uint8_t> &value) { this->put(value); }
+
+  // Getters
+
+  inline size_t get_capacity() const { return this->data_.size(); }
+  inline size_t get_position() const { return this->position_; }
+  inline size_t get_limit() const { return this->limit_; }
+  inline size_t get_remaining() const { return this->get_limit() - this->get_position(); }
+  inline Endian get_endianness() const { return this->endianness_; }
+  inline void mark() { this->mark_ = this->position_; }
+  inline void big_endian() { this->endianness_ = BIG; }
+  inline void little_endian() { this->endianness_ = LITTLE; }
+  // retrieve a pointer to the underlying data.
+  std::vector<uint8_t> get_data() { return this->data_; };
+
+  void get_bytes(void *dest, size_t length) {
+    std::copy(this->data_.begin() + this->position_, this->data_.begin() + this->position_ + length, (uint8_t *) dest);
+    this->position_ += length;
+  }
+
+  void get_bytes(void *dest, size_t length, size_t offset) {
+    std::copy(this->data_.begin() + offset, this->data_.begin() + offset + length, (uint8_t *) dest);
+  }
+
+  void rewind() { this->position_ = 0; }
+  void reset() { this->position_ = this->mark_; }
+
+  void set_limit(size_t limit) { this->limit_ = limit; }
+  void set_position(size_t position) { this->position_ = position; }
+  void clear() {
+    this->limit_ = this->get_capacity();
+    this->position_ = 0;
+  }
+  void flip() {
+    this->limit_ = this->position_;
+    this->position_ = 0;
+  }
+
+ protected:
+  uint64_t get_uint64_(size_t offset, size_t length) const {
+    uint64_t value = 0;
+    if (this->endianness_ == LITTLE) {
+      offset += length;
+      while (length-- != 0) {
+        value <<= 8;
+        value |= this->data_[--offset];
+      }
+    } else {
+      while (length-- != 0) {
+        value <<= 8;
+        value |= this->data_[offset++];
+      }
+    }
+    return value;
+  }
+
+  uint64_t get_uint64_(size_t length) {
+    auto result = this->get_uint64_(this->position_, length);
+    this->position_ += length;
+    return result;
+  }
+  uint32_t get_uint32_(size_t offset, size_t length) const {
+    uint32_t value = 0;
+    if (this->endianness_ == LITTLE) {
+      offset += length;
+      while (length-- != 0) {
+        value <<= 8;
+        value |= this->data_[--offset];
+      }
+    } else {
+      while (length-- != 0) {
+        value <<= 8;
+        value |= this->data_[offset++];
+      }
+    }
+    return value;
+  }
+
+  uint32_t get_uint32_(size_t length) {
+    auto result = this->get_uint32_(this->position_, length);
+    this->position_ += length;
+    return result;
+  }
+
+  /// Putters
+
+  void put_uint64_(uint64_t value, size_t length) {
+    this->put_uint64_(value, this->position_, length);
+    this->position_ += length;
+  }
+  void put_uint32_(uint32_t value, size_t length) {
+    this->put_uint32_(value, this->position_, length);
+    this->position_ += length;
+  }
+
+  void put_uint64_(uint64_t value, size_t offset, size_t length) {
+    if (this->endianness_ == LITTLE) {
+      while (length-- != 0) {
+        this->data_[offset++] = static_cast<uint8_t>(value);
+        value >>= 8;
+      }
+    } else {
+      offset += length;
+      while (length-- != 0) {
+        this->data_[--offset] = static_cast<uint8_t>(value);
+        value >>= 8;
+      }
+    }
+  }
+
+  void put_uint32_(uint32_t value, size_t offset, size_t length) {
+    if (this->endianness_ == LITTLE) {
+      while (length-- != 0) {
+        this->data_[offset++] = static_cast<uint8_t>(value);
+        value >>= 8;
+      }
+    } else {
+      offset += length;
+      while (length-- != 0) {
+        this->data_[--offset] = static_cast<uint8_t>(value);
+        value >>= 8;
+      }
+    }
+  }
+  ByteBuffer(std::vector<uint8_t> const &data) : data_(data), limit_(data.size()) {}
+
+  std::vector<uint8_t> data_;
+  Endian endianness_{LITTLE};
+  size_t position_{0};
+  size_t mark_{0};
+  size_t limit_{0};
+};
+
+}  // namespace bytebuffer
+}  // namespace esphome

esphome/components/climate/__init__.py

@@ -119,10 +119,21 @@ visual_temperature = cv.float_with_unit(
 )
 
 
-def single_visual_temperature(value):
+VISUAL_TEMPERATURE_STEP_SCHEMA = cv.Schema(
-    if isinstance(value, dict):
+    {
-        return value
+        cv.Required(CONF_TARGET_TEMPERATURE): visual_temperature,
+        cv.Required(CONF_CURRENT_TEMPERATURE): visual_temperature,
+    }
+)
 
+
+def visual_temperature_step(value):
+
+    # Allow defining target/current temperature steps separately
+    if isinstance(value, dict):
+        return VISUAL_TEMPERATURE_STEP_SCHEMA(value)
+
+    # Otherwise, use the single value for both properties
     value = visual_temperature(value)
     return VISUAL_TEMPERATURE_STEP_SCHEMA(
         {
@@ -141,16 +152,6 @@ ControlTrigger = climate_ns.class_(
     "ControlTrigger", automation.Trigger.template(ClimateCall.operator("ref"))
 )
 
-VISUAL_TEMPERATURE_STEP_SCHEMA = cv.Any(
-    single_visual_temperature,
-    cv.Schema(
-        {
-            cv.Required(CONF_TARGET_TEMPERATURE): visual_temperature,
-            cv.Required(CONF_CURRENT_TEMPERATURE): visual_temperature,
-        }
-    ),
-)
-
 CLIMATE_SCHEMA = (
     cv.ENTITY_BASE_SCHEMA.extend(web_server.WEBSERVER_SORTING_SCHEMA)
     .extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
@@ -162,7 +163,7 @@ CLIMATE_SCHEMA = (
                 {
                     cv.Optional(CONF_MIN_TEMPERATURE): cv.temperature,
                     cv.Optional(CONF_MAX_TEMPERATURE): cv.temperature,
-                    cv.Optional(CONF_TEMPERATURE_STEP): VISUAL_TEMPERATURE_STEP_SCHEMA,
+                    cv.Optional(CONF_TEMPERATURE_STEP): visual_temperature_step,
                     cv.Optional(CONF_MIN_HUMIDITY): cv.percentage_int,
                     cv.Optional(CONF_MAX_HUMIDITY): cv.percentage_int,
                 }

esphome/components/datetime/__init__.py

@@ -70,8 +70,6 @@ def _validate_time_present(config):
 
 
 _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
-    web_server.WEBSERVER_SORTING_SCHEMA,
-    cv.MQTT_COMMAND_COMPONENT_SCHEMA,
     cv.Schema(
         {
             cv.Optional(CONF_ON_VALUE): automation.validate_automation(
@@ -81,7 +79,9 @@ _DATETIME_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(
             ),
             cv.Optional(CONF_TIME_ID): cv.use_id(time.RealTimeClock),
         }
-    ),
+    )
+    .extend(web_server.WEBSERVER_SORTING_SCHEMA)
+    .extend(cv.MQTT_COMMAND_COMPONENT_SCHEMA)
 ).add_extra(_validate_time_present)
 
 

esphome/components/dfplayer/dfplayer.cpp

@@ -6,7 +6,104 @@ namespace dfplayer {
 
 static const char *const TAG = "dfplayer";
 
+void DFPlayer::next() {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing next track");
+  this->send_cmd_(0x01);
+}
+
+void DFPlayer::previous() {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing previous track");
+  this->send_cmd_(0x02);
+}
+void DFPlayer::play_mp3(uint16_t file) {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing file %d in mp3 folder", file);
+  this->send_cmd_(0x12, file);
+}
+
+void DFPlayer::play_file(uint16_t file) {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing file %d", file);
+  this->send_cmd_(0x03, file);
+}
+
+void DFPlayer::play_file_loop(uint16_t file) {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing file %d in loop", file);
+  this->send_cmd_(0x08, file);
+}
+
+void DFPlayer::play_folder_loop(uint16_t folder) {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing folder %d in loop", folder);
+  this->send_cmd_(0x17, folder);
+}
+
+void DFPlayer::volume_up() {
+  ESP_LOGD(TAG, "Increasing volume");
+  this->send_cmd_(0x04);
+}
+
+void DFPlayer::volume_down() {
+  ESP_LOGD(TAG, "Decreasing volume");
+  this->send_cmd_(0x05);
+}
+
+void DFPlayer::set_device(Device device) {
+  ESP_LOGD(TAG, "Setting device to %d", device);
+  this->send_cmd_(0x09, device);
+}
+
+void DFPlayer::set_volume(uint8_t volume) {
+  ESP_LOGD(TAG, "Setting volume to %d", volume);
+  this->send_cmd_(0x06, volume);
+}
+
+void DFPlayer::set_eq(EqPreset preset) {
+  ESP_LOGD(TAG, "Setting EQ to %d", preset);
+  this->send_cmd_(0x07, preset);
+}
+
+void DFPlayer::sleep() {
+  this->ack_reset_is_playing_ = true;
+  ESP_LOGD(TAG, "Putting DFPlayer to sleep");
+  this->send_cmd_(0x0A);
+}
+
+void DFPlayer::reset() {
+  this->ack_reset_is_playing_ = true;
+  ESP_LOGD(TAG, "Resetting DFPlayer");
+  this->send_cmd_(0x0C);
+}
+
+void DFPlayer::start() {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Starting playback");
+  this->send_cmd_(0x0D);
+}
+
+void DFPlayer::pause() {
+  this->ack_reset_is_playing_ = true;
+  ESP_LOGD(TAG, "Pausing playback");
+  this->send_cmd_(0x0E);
+}
+
+void DFPlayer::stop() {
+  this->ack_reset_is_playing_ = true;
+  ESP_LOGD(TAG, "Stopping playback");
+  this->send_cmd_(0x16);
+}
+
+void DFPlayer::random() {
+  this->ack_set_is_playing_ = true;
+  ESP_LOGD(TAG, "Playing random file");
+  this->send_cmd_(0x18);
+}
+
 void DFPlayer::play_folder(uint16_t folder, uint16_t file) {
+  ESP_LOGD(TAG, "Playing file %d in folder %d", file, folder);
   if (folder < 100 && file < 256) {
     this->ack_set_is_playing_ = true;
     this->send_cmd_(0x0F, (uint8_t) folder, (uint8_t) file);
@@ -29,7 +126,7 @@ void DFPlayer::send_cmd_(uint8_t cmd, uint16_t argument) {
 
   this->sent_cmd_ = cmd;
 
-  ESP_LOGD(TAG, "Send Command %#02x arg %#04x", cmd, argument);
+  ESP_LOGV(TAG, "Send Command %#02x arg %#04x", cmd, argument);
   this->write_array(buffer, 10);
 }
 
@@ -101,9 +198,37 @@ void DFPlayer::loop() {
             ESP_LOGV(TAG, "Nack");
             this->ack_set_is_playing_ = false;
             this->ack_reset_is_playing_ = false;
-            if (argument == 6) {
+            switch (argument) {
-              ESP_LOGV(TAG, "File not found");
+              case 0x01:
-              this->is_playing_ = false;
+                ESP_LOGE(TAG, "Module is busy or uninitialized");
+                break;
+              case 0x02:
+                ESP_LOGE(TAG, "Module is in sleep mode");
+                break;
+              case 0x03:
+                ESP_LOGE(TAG, "Serial receive error");
+                break;
+              case 0x04:
+                ESP_LOGE(TAG, "Checksum incorrect");
+                break;
+              case 0x05:
+                ESP_LOGE(TAG, "Specified track is out of current track scope");
+                this->is_playing_ = false;
+                break;
+              case 0x06:
+                ESP_LOGE(TAG, "Specified track is not found");
+                this->is_playing_ = false;
+                break;
+              case 0x07:
+                ESP_LOGE(TAG, "Insertion error (an inserting operation only can be done when a track is being played)");
+                break;
+              case 0x08:
+                ESP_LOGE(TAG, "SD card reading failed (SD card pulled out or damaged)");
+                break;
+              case 0x09:
+                ESP_LOGE(TAG, "Entered into sleep mode");
+                this->is_playing_ = false;
+                break;
             }
             break;
           case 0x41:
@@ -113,12 +238,13 @@ void DFPlayer::loop() {
             this->ack_set_is_playing_ = false;
             this->ack_reset_is_playing_ = false;
             break;
-          case 0x3D:  // Playback finished
+          case 0x3D:
+            ESP_LOGV(TAG, "Playback finished");
             this->is_playing_ = false;
             this->on_finished_playback_callback_.call();
             break;
           default:
-            ESP_LOGD(TAG, "Command %#02x arg %#04x", cmd, argument);
+            ESP_LOGV(TAG, "Received unknown cmd %#02x arg %#04x", cmd, argument);
         }
         this->sent_cmd_ = 0;
         this->read_pos_ = 0;

esphome/components/dfplayer/dfplayer.h

@@ -23,64 +23,30 @@ enum Device {
   TF_CARD = 2,
 };
 
+// See the datasheet here:
+// https://github.com/DFRobot/DFRobotDFPlayerMini/blob/master/doc/FN-M16P%2BEmbedded%2BMP3%2BAudio%2BModule%2BDatasheet.pdf
 class DFPlayer : public uart::UARTDevice, public Component {
  public:
   void loop() override;
 
-  void next() {
+  void next();
-    this->ack_set_is_playing_ = true;
+  void previous();
-    this->send_cmd_(0x01);
+  void play_mp3(uint16_t file);
-  }
+  void play_file(uint16_t file);
-  void previous() {
+  void play_file_loop(uint16_t file);
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x02);
-  }
-  void play_mp3(uint16_t file) {
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x12, file);
-  }
-  void play_file(uint16_t file) {
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x03, file);
-  }
-  void play_file_loop(uint16_t file) {
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x08, file);
-  }
   void play_folder(uint16_t folder, uint16_t file);
-  void play_folder_loop(uint16_t folder) {
+  void play_folder_loop(uint16_t folder);
-    this->ack_set_is_playing_ = true;
+  void volume_up();
-    this->send_cmd_(0x17, folder);
+  void volume_down();
-  }
+  void set_device(Device device);
-  void volume_up() { this->send_cmd_(0x04); }
+  void set_volume(uint8_t volume);
-  void volume_down() { this->send_cmd_(0x05); }
+  void set_eq(EqPreset preset);
-  void set_device(Device device) { this->send_cmd_(0x09, device); }
+  void sleep();
-  void set_volume(uint8_t volume) { this->send_cmd_(0x06, volume); }
+  void reset();
-  void set_eq(EqPreset preset) { this->send_cmd_(0x07, preset); }
+  void start();
-  void sleep() {
+  void pause();
-    this->ack_reset_is_playing_ = true;
+  void stop();
-    this->send_cmd_(0x0A);
+  void random();
-  }
-  void reset() {
-    this->ack_reset_is_playing_ = true;
-    this->send_cmd_(0x0C);
-  }
-  void start() {
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x0D);
-  }
-  void pause() {
-    this->ack_reset_is_playing_ = true;
-    this->send_cmd_(0x0E);
-  }
-  void stop() {
-    this->ack_reset_is_playing_ = true;
-    this->send_cmd_(0x16);
-  }
-  void random() {
-    this->ack_set_is_playing_ = true;
-    this->send_cmd_(0x18);
-  }
 
   bool is_playing() { return is_playing_; }
   void dump_config() override;

esphome/components/es8311/audio_dac.py

@@ -0,0 +1,70 @@
+import esphome.codegen as cg
+from esphome.components import i2c
+from esphome.components.audio_dac import AudioDac
+import esphome.config_validation as cv
+from esphome.const import CONF_BITS_PER_SAMPLE, CONF_ID, CONF_SAMPLE_RATE
+
+CODEOWNERS = ["@kroimon", "@kahrendt"]
+DEPENDENCIES = ["i2c"]
+
+es8311_ns = cg.esphome_ns.namespace("es8311")
+ES8311 = es8311_ns.class_("ES8311", AudioDac, cg.Component, i2c.I2CDevice)
+
+CONF_MIC_GAIN = "mic_gain"
+CONF_USE_MCLK = "use_mclk"
+CONF_USE_MICROPHONE = "use_microphone"
+
+es8311_resolution = es8311_ns.enum("ES8311Resolution")
+ES8311_BITS_PER_SAMPLE_ENUM = {
+    16: es8311_resolution.ES8311_RESOLUTION_16,
+    24: es8311_resolution.ES8311_RESOLUTION_24,
+    32: es8311_resolution.ES8311_RESOLUTION_32,
+}
+
+es8311_mic_gain = es8311_ns.enum("ES8311MicGain")
+ES8311_MIC_GAIN_ENUM = {
+    "MIN": es8311_mic_gain.ES8311_MIC_GAIN_MIN,
+    "0DB": es8311_mic_gain.ES8311_MIC_GAIN_0DB,
+    "6DB": es8311_mic_gain.ES8311_MIC_GAIN_6DB,
+    "12DB": es8311_mic_gain.ES8311_MIC_GAIN_12DB,
+    "18DB": es8311_mic_gain.ES8311_MIC_GAIN_18DB,
+    "24DB": es8311_mic_gain.ES8311_MIC_GAIN_24DB,
+    "30DB": es8311_mic_gain.ES8311_MIC_GAIN_30DB,
+    "36DB": es8311_mic_gain.ES8311_MIC_GAIN_36DB,
+    "42DB": es8311_mic_gain.ES8311_MIC_GAIN_42DB,
+    "MAX": es8311_mic_gain.ES8311_MIC_GAIN_MAX,
+}
+
+
+_validate_bits = cv.float_with_unit("bits", "bit")
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ES8311),
+            cv.Optional(CONF_BITS_PER_SAMPLE, default="16bit"): cv.All(
+                _validate_bits, cv.enum(ES8311_BITS_PER_SAMPLE_ENUM)
+            ),
+            cv.Optional(CONF_MIC_GAIN, default="42DB"): cv.enum(
+                ES8311_MIC_GAIN_ENUM, upper=True
+            ),
+            cv.Optional(CONF_SAMPLE_RATE, default=16000): cv.int_range(min=1),
+            cv.Optional(CONF_USE_MCLK, default=True): cv.boolean,
+            cv.Optional(CONF_USE_MICROPHONE, default=False): cv.boolean,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(i2c.i2c_device_schema(0x18))
+)
+
+
+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)
+
+    cg.add(var.set_bits_per_sample(config[CONF_BITS_PER_SAMPLE]))
+    cg.add(var.set_mic_gain(config[CONF_MIC_GAIN]))
+    cg.add(var.set_sample_frequency(config[CONF_SAMPLE_RATE]))
+    cg.add(var.set_use_mclk(config[CONF_USE_MCLK]))
+    cg.add(var.set_use_mic(config[CONF_USE_MICROPHONE]))

esphome/components/es8311/es8311.cpp

@@ -0,0 +1,227 @@
+#include "es8311.h"
+#include "es8311_const.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/log.h"
+#include <cinttypes>
+
+namespace esphome {
+namespace es8311 {
+
+static const char *const TAG = "es8311";
+
+// Mark the component as failed; use only in setup
+#define ES8311_ERROR_FAILED(func) \
+  if (!(func)) { \
+    this->mark_failed(); \
+    return; \
+  }
+// Return false; use outside of setup
+#define ES8311_ERROR_CHECK(func) \
+  if (!(func)) { \
+    return false; \
+  }
+
+void ES8311::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up ES8311...");
+
+  // Reset
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG00_RESET, 0x1F));
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG00_RESET, 0x00));
+
+  ES8311_ERROR_FAILED(this->configure_clock_());
+  ES8311_ERROR_FAILED(this->configure_format_());
+  ES8311_ERROR_FAILED(this->configure_mic_());
+
+  // Set initial volume
+  this->set_volume(0.75);  // 0.75 = 0xBF = 0dB
+
+  // Power up analog circuitry
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG0D_SYSTEM, 0x01));
+  // Enable analog PGA, enable ADC modulator
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG0E_SYSTEM, 0x02));
+  // Power up DAC
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG12_SYSTEM, 0x00));
+  // Enable output to HP drive
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG13_SYSTEM, 0x10));
+  // ADC Equalizer bypass, cancel DC offset in digital domain
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG1C_ADC, 0x6A));
+  // Bypass DAC equalizer
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG37_DAC, 0x08));
+  // Power On
+  ES8311_ERROR_FAILED(this->write_byte(ES8311_REG00_RESET, 0x80));
+}
+
+void ES8311::dump_config() {
+  ESP_LOGCONFIG(TAG, "ES8311 Audio Codec:");
+  ESP_LOGCONFIG(TAG, "  Use MCLK: %s", YESNO(this->use_mclk_));
+  ESP_LOGCONFIG(TAG, "  Use Microphone: %s", YESNO(this->use_mic_));
+  ESP_LOGCONFIG(TAG, "  DAC Bits per Sample: %" PRIu8, this->resolution_out_);
+  ESP_LOGCONFIG(TAG, "  Sample Rate: %" PRIu32, this->sample_frequency_);
+
+  if (this->is_failed()) {
+    ESP_LOGCONFIG(TAG, "  Failed to initialize!");
+    return;
+  }
+}
+
+bool ES8311::set_volume(float volume) {
+  volume = clamp(volume, 0.0f, 1.0f);
+  uint8_t reg32 = remap<uint8_t, float>(volume, 0.0f, 1.0f, 0, 255);
+  return this->write_byte(ES8311_REG32_DAC, reg32);
+}
+
+float ES8311::volume() {
+  uint8_t reg32;
+  this->read_byte(ES8311_REG32_DAC, &reg32);
+  return remap<float, uint8_t>(reg32, 0, 255, 0.0f, 1.0f);
+}
+
+uint8_t ES8311::calculate_resolution_value(ES8311Resolution resolution) {
+  switch (resolution) {
+    case ES8311_RESOLUTION_16:
+      return (3 << 2);
+    case ES8311_RESOLUTION_18:
+      return (2 << 2);
+    case ES8311_RESOLUTION_20:
+      return (1 << 2);
+    case ES8311_RESOLUTION_24:
+      return (0 << 2);
+    case ES8311_RESOLUTION_32:
+      return (4 << 2);
+    default:
+      return 0;
+  }
+}
+
+const ES8311Coefficient *ES8311::get_coefficient(uint32_t mclk, uint32_t rate) {
+  for (const auto &coefficient : ES8311_COEFFICIENTS) {
+    if (coefficient.mclk == mclk && coefficient.rate == rate)
+      return &coefficient;
+  }
+  return nullptr;
+}
+
+bool ES8311::configure_clock_() {
+  // Register 0x01: select clock source for internal MCLK and determine its frequency
+  uint8_t reg01 = 0x3F;  // Enable all clocks
+
+  uint32_t mclk_frequency = this->sample_frequency_ * this->mclk_multiple_;
+  if (!this->use_mclk_) {
+    reg01 |= BIT(7);  // Use SCLK
+    mclk_frequency = this->sample_frequency_ * (int) this->resolution_out_ * 2;
+  }
+  if (this->mclk_inverted_) {
+    reg01 |= BIT(6);  // Invert MCLK pin
+  }
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG01_CLK_MANAGER, reg01));
+
+  // Get clock coefficients from coefficient table
+  auto *coefficient = get_coefficient(mclk_frequency, this->sample_frequency_);
+  if (coefficient == nullptr) {
+    ESP_LOGE(TAG, "Unable to configure sample rate %" PRIu32 "Hz with %" PRIu32 "Hz MCLK", this->sample_frequency_,
+             mclk_frequency);
+    return false;
+  }
+
+  // Register 0x02
+  uint8_t reg02;
+  ES8311_ERROR_CHECK(this->read_byte(ES8311_REG02_CLK_MANAGER, &reg02));
+  reg02 &= 0x07;
+  reg02 |= (coefficient->pre_div - 1) << 5;
+  reg02 |= coefficient->pre_mult << 3;
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG02_CLK_MANAGER, reg02));
+
+  // Register 0x03
+  const uint8_t reg03 = (coefficient->fs_mode << 6) | coefficient->adc_osr;
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG03_CLK_MANAGER, reg03));
+
+  // Register 0x04
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG04_CLK_MANAGER, coefficient->dac_osr));
+
+  // Register 0x05
+  const uint8_t reg05 = ((coefficient->adc_div - 1) << 4) | (coefficient->dac_div - 1);
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG05_CLK_MANAGER, reg05));
+
+  // Register 0x06
+  uint8_t reg06;
+  ES8311_ERROR_CHECK(this->read_byte(ES8311_REG06_CLK_MANAGER, &reg06));
+  if (this->sclk_inverted_) {
+    reg06 |= BIT(5);
+  } else {
+    reg06 &= ~BIT(5);
+  }
+  reg06 &= 0xE0;
+  if (coefficient->bclk_div < 19) {
+    reg06 |= (coefficient->bclk_div - 1) << 0;
+  } else {
+    reg06 |= (coefficient->bclk_div) << 0;
+  }
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG06_CLK_MANAGER, reg06));
+
+  // Register 0x07
+  uint8_t reg07;
+  ES8311_ERROR_CHECK(this->read_byte(ES8311_REG07_CLK_MANAGER, &reg07));
+  reg07 &= 0xC0;
+  reg07 |= coefficient->lrck_h << 0;
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG07_CLK_MANAGER, reg07));
+
+  // Register 0x08
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG08_CLK_MANAGER, coefficient->lrck_l));
+
+  // Successfully configured the clock
+  return true;
+}
+
+bool ES8311::configure_format_() {
+  // Configure I2S mode and format
+  uint8_t reg00;
+  ES8311_ERROR_CHECK(this->read_byte(ES8311_REG00_RESET, &reg00));
+  reg00 &= 0xBF;
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG00_RESET, reg00));
+
+  // Configure SDP in resolution
+  uint8_t reg09 = calculate_resolution_value(this->resolution_in_);
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG09_SDPIN, reg09));
+
+  // Configure SDP out resolution
+  uint8_t reg0a = calculate_resolution_value(this->resolution_out_);
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG0A_SDPOUT, reg0a));
+
+  // Successfully configured the format
+  return true;
+}
+
+bool ES8311::configure_mic_() {
+  uint8_t reg14 = 0x1A;  // Enable analog MIC and max PGA gain
+  if (this->use_mic_) {
+    reg14 |= BIT(6);  // Enable PDM digital microphone
+  }
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG14_SYSTEM, reg14));
+
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG16_ADC, this->mic_gain_));  // ADC gain scale up
+  ES8311_ERROR_CHECK(this->write_byte(ES8311_REG17_ADC, 0xC8));             // Set ADC gain
+
+  // Successfully configured the microphones
+  return true;
+}
+
+bool ES8311::set_mute_state_(bool mute_state) {
+  uint8_t reg31;
+
+  this->is_muted_ = mute_state;
+
+  if (!this->read_byte(ES8311_REG31_DAC, &reg31)) {
+    return false;
+  }
+
+  if (mute_state) {
+    reg31 |= BIT(6) | BIT(5);
+  } else {
+    reg31 &= ~(BIT(6) | BIT(5));
+  }
+
+  return this->write_byte(ES8311_REG31_DAC, reg31);
+}
+
+}  // namespace es8311
+}  // namespace esphome

esphome/components/es8311/es8311.h

@@ -0,0 +1,135 @@
+#pragma once
+
+#include "esphome/components/audio_dac/audio_dac.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace es8311 {
+
+enum ES8311MicGain {
+  ES8311_MIC_GAIN_MIN = -1,
+  ES8311_MIC_GAIN_0DB,
+  ES8311_MIC_GAIN_6DB,
+  ES8311_MIC_GAIN_12DB,
+  ES8311_MIC_GAIN_18DB,
+  ES8311_MIC_GAIN_24DB,
+  ES8311_MIC_GAIN_30DB,
+  ES8311_MIC_GAIN_36DB,
+  ES8311_MIC_GAIN_42DB,
+  ES8311_MIC_GAIN_MAX
+};
+
+enum ES8311Resolution : uint8_t {
+  ES8311_RESOLUTION_16 = 16,
+  ES8311_RESOLUTION_18 = 18,
+  ES8311_RESOLUTION_20 = 20,
+  ES8311_RESOLUTION_24 = 24,
+  ES8311_RESOLUTION_32 = 32
+};
+
+struct ES8311Coefficient {
+  uint32_t mclk;     // mclk frequency
+  uint32_t rate;     // sample rate
+  uint8_t pre_div;   // the pre divider with range from 1 to 8
+  uint8_t pre_mult;  // the pre multiplier with x1, x2, x4 and x8 selection
+  uint8_t adc_div;   // adcclk divider
+  uint8_t dac_div;   // dacclk divider
+  uint8_t fs_mode;   // single speed (0) or double speed (1)
+  uint8_t lrck_h;    // adc lrck divider and dac lrck divider
+  uint8_t lrck_l;    //
+  uint8_t bclk_div;  // sclk divider
+  uint8_t adc_osr;   // adc osr
+  uint8_t dac_osr;   // dac osr
+};
+
+class ES8311 : public audio_dac::AudioDac, public Component, public i2c::I2CDevice {
+ public:
+  /////////////////////////
+  // Component overrides //
+  /////////////////////////
+
+  void setup() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void dump_config() override;
+
+  ////////////////////////
+  // AudioDac overrides //
+  ////////////////////////
+
+  /// @brief Writes the volume out to the DAC
+  /// @param volume floating point between 0.0 and 1.0
+  /// @return True if successful and false otherwise
+  bool set_volume(float volume) override;
+
+  /// @brief Gets the current volume out from the DAC
+  /// @return floating point between 0.0 and 1.0
+  float volume() override;
+
+  /// @brief Disables mute for audio out
+  /// @return True if successful and false otherwise
+  bool set_mute_off() override { return this->set_mute_state_(false); }
+
+  /// @brief Enables mute for audio out
+  /// @return True if successful and false otherwise
+  bool set_mute_on() override { return this->set_mute_state_(true); }
+
+  bool is_muted() override { return this->is_muted_; }
+
+  //////////////////////////////////
+  // ES8311 configuration setters //
+  //////////////////////////////////
+
+  void set_use_mclk(bool use_mclk) { this->use_mclk_ = use_mclk; }
+  void set_bits_per_sample(ES8311Resolution resolution) {
+    this->resolution_in_ = resolution;
+    this->resolution_out_ = resolution;
+  }
+  void set_sample_frequency(uint32_t sample_frequency) { this->sample_frequency_ = sample_frequency; }
+  void set_use_mic(bool use_mic) { this->use_mic_ = use_mic; }
+  void set_mic_gain(ES8311MicGain mic_gain) { this->mic_gain_ = mic_gain; }
+
+ protected:
+  /// @brief Computes the register value for the configured resolution (bits per sample)
+  /// @param resolution bits per sample enum for both audio in and audio out
+  /// @return register value
+  static uint8_t calculate_resolution_value(ES8311Resolution resolution);
+
+  /// @brief Retrieves the appropriate registers values for the configured mclk and rate
+  /// @param mclk mlck frequency in Hz
+  /// @param rate sample rate frequency in Hz
+  /// @return ES8311Coeffecient containing appropriate register values to configure the ES8311 or nullptr if impossible
+  static const ES8311Coefficient *get_coefficient(uint32_t mclk, uint32_t rate);
+
+  /// @brief Configures the ES8311 registers for the chosen sample rate
+  /// @return True if successful and false otherwise
+  bool configure_clock_();
+
+  /// @brief Configures the ES8311 registers for the chosen bits per sample
+  /// @return True if successful and false otherwise
+  bool configure_format_();
+
+  /// @brief Configures the ES8311 microphone registers
+  /// @return True if successful and false otherwise
+  bool configure_mic_();
+
+  /// @brief Mutes or unmute the DAC audio out
+  /// @param mute_state True to mute, false to unmute
+  /// @return
+  bool set_mute_state_(bool mute_state);
+
+  bool use_mic_;
+  ES8311MicGain mic_gain_;
+
+  bool use_mclk_;                // true = use dedicated MCLK pin, false = use SCLK
+  bool sclk_inverted_{false};    // SCLK is inverted
+  bool mclk_inverted_{false};    // MCLK is inverted (ignored if use_mclk_ == false)
+  uint32_t mclk_multiple_{256};  // MCLK frequency is sample rate * mclk_multiple_ (ignored if use_mclk_ == false)
+
+  uint32_t sample_frequency_;  // in Hz
+  ES8311Resolution resolution_in_;
+  ES8311Resolution resolution_out_;
+};
+
+}  // namespace es8311
+}  // namespace esphome

esphome/components/es8311/es8311_const.h

@@ -0,0 +1,195 @@
+#pragma once
+
+#include "es8311.h"
+
+namespace esphome {
+namespace es8311 {
+
+// ES8311 register addresses
+static const uint8_t ES8311_REG00_RESET = 0x00;        // Reset
+static const uint8_t ES8311_REG01_CLK_MANAGER = 0x01;  // Clock Manager: select clk src for mclk, enable clock for codec
+static const uint8_t ES8311_REG02_CLK_MANAGER = 0x02;  // Clock Manager: clk divider and clk multiplier
+static const uint8_t ES8311_REG03_CLK_MANAGER = 0x03;  // Clock Manager: adc fsmode and osr
+static const uint8_t ES8311_REG04_CLK_MANAGER = 0x04;  // Clock Manager: dac osr
+static const uint8_t ES8311_REG05_CLK_MANAGER = 0x05;  // Clock Manager: clk divider for adc and dac
+static const uint8_t ES8311_REG06_CLK_MANAGER = 0x06;  // Clock Manager: bclk inverter BIT(5) and divider
+static const uint8_t ES8311_REG07_CLK_MANAGER = 0x07;  // Clock Manager: tri-state, lrck divider
+static const uint8_t ES8311_REG08_CLK_MANAGER = 0x08;  // Clock Manager: lrck divider
+static const uint8_t ES8311_REG09_SDPIN = 0x09;        // Serial Digital Port: DAC
+static const uint8_t ES8311_REG0A_SDPOUT = 0x0A;       // Serial Digital Port: ADC
+static const uint8_t ES8311_REG0B_SYSTEM = 0x0B;       // System
+static const uint8_t ES8311_REG0C_SYSTEM = 0x0C;       // System
+static const uint8_t ES8311_REG0D_SYSTEM = 0x0D;       // System: power up/down
+static const uint8_t ES8311_REG0E_SYSTEM = 0x0E;       // System: power up/down
+static const uint8_t ES8311_REG0F_SYSTEM = 0x0F;       // System: low power
+static const uint8_t ES8311_REG10_SYSTEM = 0x10;       // System
+static const uint8_t ES8311_REG11_SYSTEM = 0x11;       // System
+static const uint8_t ES8311_REG12_SYSTEM = 0x12;       // System: Enable DAC
+static const uint8_t ES8311_REG13_SYSTEM = 0x13;       // System
+static const uint8_t ES8311_REG14_SYSTEM = 0x14;       // System: select DMIC, select analog pga gain
+static const uint8_t ES8311_REG15_ADC = 0x15;          // ADC: adc ramp rate, dmic sense
+static const uint8_t ES8311_REG16_ADC = 0x16;          // ADC
+static const uint8_t ES8311_REG17_ADC = 0x17;          // ADC: volume
+static const uint8_t ES8311_REG18_ADC = 0x18;          // ADC: alc enable and winsize
+static const uint8_t ES8311_REG19_ADC = 0x19;          // ADC: alc maxlevel
+static const uint8_t ES8311_REG1A_ADC = 0x1A;          // ADC: alc automute
+static const uint8_t ES8311_REG1B_ADC = 0x1B;          // ADC: alc automute, adc hpf s1
+static const uint8_t ES8311_REG1C_ADC = 0x1C;          // ADC: equalizer, hpf s2
+static const uint8_t ES8311_REG1D_ADCEQ = 0x1D;        // ADCEQ: equalizer B0
+static const uint8_t ES8311_REG1E_ADCEQ = 0x1E;        // ADCEQ: equalizer B0
+static const uint8_t ES8311_REG1F_ADCEQ = 0x1F;        // ADCEQ: equalizer B0
+static const uint8_t ES8311_REG20_ADCEQ = 0x20;        // ADCEQ: equalizer B0
+static const uint8_t ES8311_REG21_ADCEQ = 0x21;        // ADCEQ: equalizer A1
+static const uint8_t ES8311_REG22_ADCEQ = 0x22;        // ADCEQ: equalizer A1
+static const uint8_t ES8311_REG23_ADCEQ = 0x23;        // ADCEQ: equalizer A1
+static const uint8_t ES8311_REG24_ADCEQ = 0x24;        // ADCEQ: equalizer A1
+static const uint8_t ES8311_REG25_ADCEQ = 0x25;        // ADCEQ: equalizer A2
+static const uint8_t ES8311_REG26_ADCEQ = 0x26;        // ADCEQ: equalizer A2
+static const uint8_t ES8311_REG27_ADCEQ = 0x27;        // ADCEQ: equalizer A2
+static const uint8_t ES8311_REG28_ADCEQ = 0x28;        // ADCEQ: equalizer A2
+static const uint8_t ES8311_REG29_ADCEQ = 0x29;        // ADCEQ: equalizer B1
+static const uint8_t ES8311_REG2A_ADCEQ = 0x2A;        // ADCEQ: equalizer B1
+static const uint8_t ES8311_REG2B_ADCEQ = 0x2B;        // ADCEQ: equalizer B1
+static const uint8_t ES8311_REG2C_ADCEQ = 0x2C;        // ADCEQ: equalizer B1
+static const uint8_t ES8311_REG2D_ADCEQ = 0x2D;        // ADCEQ: equalizer B2
+static const uint8_t ES8311_REG2E_ADCEQ = 0x2E;        // ADCEQ: equalizer B2
+static const uint8_t ES8311_REG2F_ADCEQ = 0x2F;        // ADCEQ: equalizer B2
+static const uint8_t ES8311_REG30_ADCEQ = 0x30;        // ADCEQ: equalizer B2
+static const uint8_t ES8311_REG31_DAC = 0x31;          // DAC: mute
+static const uint8_t ES8311_REG32_DAC = 0x32;          // DAC: volume
+static const uint8_t ES8311_REG33_DAC = 0x33;          // DAC: offset
+static const uint8_t ES8311_REG34_DAC = 0x34;          // DAC: drc enable, drc winsize
+static const uint8_t ES8311_REG35_DAC = 0x35;          // DAC: drc maxlevel, minilevel
+static const uint8_t ES8311_REG36_DAC = 0x36;          // DAC
+static const uint8_t ES8311_REG37_DAC = 0x37;          // DAC: ramprate
+static const uint8_t ES8311_REG38_DACEQ = 0x38;        // DACEQ: equalizer B0
+static const uint8_t ES8311_REG39_DACEQ = 0x39;        // DACEQ: equalizer B0
+static const uint8_t ES8311_REG3A_DACEQ = 0x3A;        // DACEQ: equalizer B0
+static const uint8_t ES8311_REG3B_DACEQ = 0x3B;        // DACEQ: equalizer B0
+static const uint8_t ES8311_REG3C_DACEQ = 0x3C;        // DACEQ: equalizer B1
+static const uint8_t ES8311_REG3D_DACEQ = 0x3D;        // DACEQ: equalizer B1
+static const uint8_t ES8311_REG3E_DACEQ = 0x3E;        // DACEQ: equalizer B1
+static const uint8_t ES8311_REG3F_DACEQ = 0x3F;        // DACEQ: equalizer B1
+static const uint8_t ES8311_REG40_DACEQ = 0x40;        // DACEQ: equalizer A1
+static const uint8_t ES8311_REG41_DACEQ = 0x41;        // DACEQ: equalizer A1
+static const uint8_t ES8311_REG42_DACEQ = 0x42;        // DACEQ: equalizer A1
+static const uint8_t ES8311_REG43_DACEQ = 0x43;        // DACEQ: equalizer A1
+static const uint8_t ES8311_REG44_GPIO = 0x44;         // GPIO: dac2adc for test
+static const uint8_t ES8311_REG45_GP = 0x45;           // GPIO: GP control
+static const uint8_t ES8311_REGFA_I2C = 0xFA;          // I2C: reset registers
+static const uint8_t ES8311_REGFC_FLAG = 0xFC;         // Flag
+static const uint8_t ES8311_REGFD_CHD1 = 0xFD;         // Chip: ID1
+static const uint8_t ES8311_REGFE_CHD2 = 0xFE;         // Chip: ID2
+static const uint8_t ES8311_REGFF_CHVER = 0xFF;        // Chip: Version
+
+// ES8311 clock divider coefficients
+static const ES8311Coefficient ES8311_COEFFICIENTS[] = {
+    // clang-format off
+
+  //   mclk,  rate, pre_  pre_  adc_  dac_  fs_   lrck  lrck bclk_  adc_  dac_
+  //                 div, mult,  div,  div, mode,   _h,   _l,  div,  osr,  osr
+
+  // 8k
+  {12288000,  8000, 0x06, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  {18432000,  8000, 0x03, 0x02, 0x03, 0x03, 0x00, 0x05, 0xff, 0x18, 0x10, 0x20},
+  {16384000,  8000, 0x08, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 8192000,  8000, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 6144000,  8000, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 4096000,  8000, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 3072000,  8000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 2048000,  8000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1536000,  8000, 0x03, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1024000,  8000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+
+  // 11.025k
+  {11289600, 11025, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 5644800, 11025, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 2822400, 11025, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1411200, 11025, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+
+  // 12k
+  {12288000, 12000, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 6144000, 12000, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 3072000, 12000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1536000, 12000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+
+  // 16k
+  {12288000, 16000, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  {18432000, 16000, 0x03, 0x02, 0x03, 0x03, 0x00, 0x02, 0xff, 0x0c, 0x10, 0x20},
+  {16384000, 16000, 0x04, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 8192000, 16000, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 6144000, 16000, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 4096000, 16000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 3072000, 16000, 0x03, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 2048000, 16000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1536000, 16000, 0x03, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+  { 1024000, 16000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x20},
+
+  // 22.05k
+  {11289600, 22050, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 5644800, 22050, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 2822400, 22050, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1411200, 22050, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+
+  // 24k
+  {12288000, 24000, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  {18432000, 24000, 0x03, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 6144000, 24000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 3072000, 24000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1536000, 24000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+
+  // 32k
+  {12288000, 32000, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  {18432000, 32000, 0x03, 0x04, 0x03, 0x03, 0x00, 0x02, 0xff, 0x0c, 0x10, 0x10},
+  {16384000, 32000, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 8192000, 32000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 6144000, 32000, 0x03, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 4096000, 32000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 3072000, 32000, 0x03, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 2048000, 32000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1536000, 32000, 0x03, 0x08, 0x01, 0x01, 0x01, 0x00, 0x7f, 0x02, 0x10, 0x10},
+  { 1024000, 32000, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+
+  // 44.1k
+  {11289600, 44100, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 5644800, 44100, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 2822400, 44100, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1411200, 44100, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+
+  // 48k
+  {12288000, 48000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  {18432000, 48000, 0x03, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 6144000, 48000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 3072000, 48000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1536000, 48000, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+
+  // 64k
+  {12288000, 64000, 0x03, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  {18432000, 64000, 0x03, 0x04, 0x03, 0x03, 0x01, 0x01, 0x7f, 0x06, 0x10, 0x10},
+  {16384000, 64000, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 8192000, 64000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 6144000, 64000, 0x01, 0x04, 0x03, 0x03, 0x01, 0x01, 0x7f, 0x06, 0x10, 0x10},
+  { 4096000, 64000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 3072000, 64000, 0x01, 0x08, 0x03, 0x03, 0x01, 0x01, 0x7f, 0x06, 0x10, 0x10},
+  { 2048000, 64000, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1536000, 64000, 0x01, 0x08, 0x01, 0x01, 0x01, 0x00, 0xbf, 0x03, 0x18, 0x18},
+  { 1024000, 64000, 0x01, 0x08, 0x01, 0x01, 0x01, 0x00, 0x7f, 0x02, 0x10, 0x10},
+
+  // 88.2k
+  {11289600, 88200, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 5644800, 88200, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 2822400, 88200, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1411200, 88200, 0x01, 0x08, 0x01, 0x01, 0x01, 0x00, 0x7f, 0x02, 0x10, 0x10},
+
+  // 96k
+  {12288000, 96000, 0x01, 0x02, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  {18432000, 96000, 0x03, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 6144000, 96000, 0x01, 0x04, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 3072000, 96000, 0x01, 0x08, 0x01, 0x01, 0x00, 0x00, 0xff, 0x04, 0x10, 0x10},
+  { 1536000, 96000, 0x01, 0x08, 0x01, 0x01, 0x01, 0x00, 0x7f, 0x02, 0x10, 0x10},
+
+    // clang-format on
+};
+
+}  // namespace es8311
+}  // namespace esphome

esphome/components/esp32/__init__.py

@@ -395,6 +395,13 @@ ARDUINO_FRAMEWORK_SCHEMA = cv.All(
             cv.Optional(CONF_VERSION, default="recommended"): cv.string_strict,
             cv.Optional(CONF_SOURCE): cv.string_strict,
             cv.Optional(CONF_PLATFORM_VERSION): _parse_platform_version,
+            cv.Optional(CONF_ADVANCED, default={}): cv.Schema(
+                {
+                    cv.Optional(
+                        CONF_IGNORE_EFUSE_CUSTOM_MAC, default=False
+                    ): cv.boolean,
+                }
+            ),
         }
     ),
     _arduino_check_versions,
@@ -494,6 +501,9 @@ async def to_code(config):
     conf = config[CONF_FRAMEWORK]
     cg.add_platformio_option("platform", conf[CONF_PLATFORM_VERSION])
 
+    if CONF_ADVANCED in conf and conf[CONF_ADVANCED][CONF_IGNORE_EFUSE_CUSTOM_MAC]:
+        cg.add_define("USE_ESP32_IGNORE_EFUSE_CUSTOM_MAC")
+
     add_extra_script(
         "post",
         "post_build.py",
@@ -540,8 +550,6 @@ async def to_code(config):
         for name, value in conf[CONF_SDKCONFIG_OPTIONS].items():
             add_idf_sdkconfig_option(name, RawSdkconfigValue(value))
 
-        if conf[CONF_ADVANCED][CONF_IGNORE_EFUSE_CUSTOM_MAC]:
-            cg.add_define("USE_ESP32_IGNORE_EFUSE_CUSTOM_MAC")
         if conf[CONF_ADVANCED].get(CONF_IGNORE_EFUSE_MAC_CRC):
             add_idf_sdkconfig_option("CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR", True)
             if (framework_ver.major, framework_ver.minor) >= (4, 4):

esphome/components/esp32/boards.py

@@ -103,6 +103,173 @@ ESP32_BOARD_PINS = {
         "LED": 13,
         "LED_BUILTIN": 13,
     },
+    "adafruit_feather_esp32s3": {
+        "BUTTON": 0,
+        "A0": 18,
+        "A1": 17,
+        "A2": 16,
+        "A3": 15,
+        "A4": 14,
+        "A5": 8,
+        "SCK": 36,
+        "MOSI": 35,
+        "MISO": 37,
+        "RX": 38,
+        "TX": 39,
+        "SCL": 4,
+        "SDA": 3,
+        "NEOPIXEL": 33,
+        "PIN_NEOPIXEL": 33,
+        "NEOPIXEL_POWER": 21,
+        "I2C_POWER": 7,
+        "LED": 13,
+        "LED_BUILTIN": 13,
+    },
+    "adafruit_feather_esp32s3_nopsram": {
+        "BUTTON": 0,
+        "A0": 18,
+        "A1": 17,
+        "A2": 16,
+        "A3": 15,
+        "A4": 14,
+        "A5": 8,
+        "SCK": 36,
+        "MOSI": 35,
+        "MISO": 37,
+        "RX": 38,
+        "TX": 39,
+        "SCL": 4,
+        "SDA": 3,
+        "NEOPIXEL": 33,
+        "PIN_NEOPIXEL": 33,
+        "NEOPIXEL_POWER": 21,
+        "I2C_POWER": 7,
+        "LED": 13,
+        "LED_BUILTIN": 13,
+    },
+    "adafruit_feather_esp32s3_tft": {
+        "BUTTON": 0,
+        "A0": 18,
+        "A1": 17,
+        "A2": 16,
+        "A3": 15,
+        "A4": 14,
+        "A5": 8,
+        "SCK": 36,
+        "MOSI": 35,
+        "MISO": 37,
+        "RX": 2,
+        "TX": 1,
+        "SCL": 41,
+        "SDA": 42,
+        "NEOPIXEL": 33,
+        "PIN_NEOPIXEL": 33,
+        "NEOPIXEL_POWER": 34,
+        "TFT_I2C_POWER": 21,
+        "TFT_CS": 7,
+        "TFT_DC": 39,
+        "TFT_RESET": 40,
+        "TFT_BACKLIGHT": 45,
+        "LED": 13,
+        "LED_BUILTIN": 13,
+    },
+    "adafruit_funhouse_esp32s2": {
+        "BUTTON_UP": 5,
+        "BUTTON_DOWN": 3,
+        "BUTTON_SELECT": 4,
+        "DOTSTAR_DATA": 14,
+        "DOTSTAR_CLOCK": 15,
+        "PIR_SENSE": 16,
+        "A0": 17,
+        "A1": 2,
+        "A2": 1,
+        "CAP6": 6,
+        "CAP7": 7,
+        "CAP8": 8,
+        "CAP9": 9,
+        "CAP10": 10,
+        "CAP11": 11,
+        "CAP12": 12,
+        "CAP13": 13,
+        "SPEAKER": 42,
+        "LED": 37,
+        "LIGHT": 18,
+        "TFT_MOSI": 35,
+        "TFT_SCK": 36,
+        "TFT_CS": 40,
+        "TFT_DC": 39,
+        "TFT_RESET": 41,
+        "TFT_BACKLIGHT": 21,
+        "RED_LED": 31,
+        "BUTTON": 0,
+    },
+    "adafruit_itsybitsy_esp32": {
+        "A0": 25,
+        "A1": 26,
+        "A2": 4,
+        "A3": 38,
+        "A4": 37,
+        "A5": 36,
+        "SCK": 19,
+        "MOSI": 21,
+        "MISO": 22,
+        "SCL": 27,
+        "SDA": 15,
+        "TX": 20,
+        "RX": 8,
+        "NEOPIXEL": 0,
+        "PIN_NEOPIXEL": 0,
+        "NEOPIXEL_POWER": 2,
+        "BUTTON": 35,
+    },
+    "adafruit_magtag29_esp32s2": {
+        "A1": 18,
+        "BUTTON_A": 15,
+        "BUTTON_B": 14,
+        "BUTTON_C": 12,
+        "BUTTON_D": 11,
+        "SDA": 33,
+        "SCL": 34,
+        "SPEAKER": 17,
+        "SPEAKER_ENABLE": 16,
+        "VOLTAGE_MONITOR": 4,
+        "ACCELEROMETER_INT": 9,
+        "ACCELEROMETER_INTERRUPT": 9,
+        "LIGHT": 3,
+        "NEOPIXEL": 1,
+        "PIN_NEOPIXEL": 1,
+        "NEOPIXEL_POWER": 21,
+        "EPD_BUSY": 5,
+        "EPD_RESET": 6,
+        "EPD_DC": 7,
+        "EPD_CS": 8,
+        "EPD_MOSI": 35,
+        "EPD_SCK": 36,
+        "EPD_MISO": 37,
+        "BUTTON": 0,
+        "LED": 13,
+        "LED_BUILTIN": 13,
+    },
+    "adafruit_metro_esp32s2": {
+        "A0": 17,
+        "A1": 18,
+        "A2": 1,
+        "A3": 2,
+        "A4": 3,
+        "A5": 4,
+        "RX": 38,
+        "TX": 37,
+        "SCL": 34,
+        "SDA": 33,
+        "MISO": 37,
+        "SCK": 36,
+        "MOSI": 35,
+        "NEOPIXEL": 45,
+        "PIN_NEOPIXEL": 45,
+        "LED": 42,
+        "LED_BUILTIN": 42,
+        "BUTTON": 0,
+    },
     "adafruit_qtpy_esp32c3": {
         "A0": 4,
         "A1": 3,
@@ -141,6 +308,26 @@ ESP32_BOARD_PINS = {
         "BUTTON": 0,
         "SWITCH": 0,
     },
+    "adafruit_qtpy_esp32s3_nopsram": {
+        "A0": 18,
+        "A1": 17,
+        "A2": 9,
+        "A3": 8,
+        "SDA": 7,
+        "SCL": 6,
+        "MOSI": 35,
+        "MISO": 37,
+        "SCK": 36,
+        "RX": 16,
+        "TX": 5,
+        "SDA1": 41,
+        "SCL1": 40,
+        "NEOPIXEL": 39,
+        "PIN_NEOPIXEL": 39,
+        "NEOPIXEL_POWER": 38,
+        "BUTTON": 0,
+        "SWITCH": 0,
+    },
     "adafruit_qtpy_esp32": {
         "A0": 26,
         "A1": 25,
@@ -1068,7 +1255,18 @@ ESP32_BOARD_PINS = {
         "_VBAT": 35,
     },
     "wemosbat": {"LED": 16},
-    "wesp32": {"MISO": 32, "SCL": 4, "SDA": 15},
+    "wesp32": {
+        "MISO": 32,
+        "MOSI": 23,
+        "SCK": 18,
+        "SCL": 4,
+        "SDA": 15,
+        "MISO1": 12,
+        "MOSI1": 13,
+        "SCK1": 14,
+        "SCL1": 5,
+        "SDA1": 33,
+    },
     "widora-air": {
         "A1": 39,
         "A2": 35,

esphome/components/esp32/gpio.py

@@ -67,8 +67,10 @@ def _translate_pin(value):
             "This variable only supports pin numbers, not full pin schemas "
             "(with inverted and mode)."
         )
-    if isinstance(value, int):
+    if isinstance(value, int) and not isinstance(value, bool):
         return value
+    if not isinstance(value, str):
+        raise cv.Invalid(f"Invalid pin number: {value}")
     try:
         return int(value)
     except ValueError:

esphome/components/esp32_ble_client/ble_client_base.h

@@ -35,7 +35,7 @@ class BLEClientBase : public espbt::ESPBTClient, public Component {
   void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
   void connect() override;
   esp_err_t pair();
-  void disconnect();
+  void disconnect() override;
   void release_services();
 
   bool connected() { return this->state_ == espbt::ClientState::ESTABLISHED; }

esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp

@@ -65,6 +65,9 @@ void ESP32BLETracker::setup() {
       [this](ota::OTAState state, float progress, uint8_t error, ota::OTAComponent *comp) {
         if (state == ota::OTA_STARTED) {
           this->stop_scan();
+          for (auto *client : this->clients_) {
+            client->disconnect();
+          }
         }
       });
 #endif

esphome/components/esp32_ble_tracker/esp32_ble_tracker.h

@@ -11,9 +11,9 @@
 
 #ifdef USE_ESP32
 
+#include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
 #include <esp_gattc_api.h>
-#include <esp_bt_defs.h>
 
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
@@ -172,6 +172,7 @@ class ESPBTClient : public ESPBTDeviceListener {
                                    esp_ble_gattc_cb_param_t *param) = 0;
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
   virtual void connect() = 0;
+  virtual void disconnect() = 0;
   virtual void set_state(ClientState st) { this->state_ = st; }
   ClientState state() const { return state_; }
   int app_id;

esphome/components/esp8266/gpio.py

@@ -1,6 +1,9 @@
-import logging
 from dataclasses import dataclass
+import logging
 
+from esphome import pins
+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ANALOG,
     CONF_ID,
@@ -14,10 +17,7 @@ from esphome.const import (
     CONF_PULLUP,
     PLATFORM_ESP8266,
 )
-from esphome import pins
 from esphome.core import CORE, coroutine_with_priority
-import esphome.config_validation as cv
-import esphome.codegen as cg
 
 from . import boards
 from .const import KEY_BOARD, KEY_ESP8266, KEY_PIN_INITIAL_STATES, esp8266_ns
@@ -48,8 +48,10 @@ def _translate_pin(value):
             "This variable only supports pin numbers, not full pin schemas "
             "(with inverted and mode)."
         )
-    if isinstance(value, int):
+    if isinstance(value, int) and not isinstance(value, bool):
         return value
+    if not isinstance(value, str):
+        raise cv.Invalid(f"Invalid pin number: {value}")
     try:
         return int(value)
     except ValueError:

esphome/components/esphome/ota/__init__.py

@@ -1,10 +1,9 @@
 import logging
 
 import esphome.codegen as cg
-import esphome.config_validation as cv
+from esphome.components.ota import BASE_OTA_SCHEMA, OTAComponent, ota_to_code
-import esphome.final_validate as fv
-from esphome.components.ota import BASE_OTA_SCHEMA, ota_to_code, OTAComponent
 from esphome.config_helpers import merge_config
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ESPHOME,
     CONF_ID,
@@ -18,6 +17,7 @@ from esphome.const import (
     CONF_VERSION,
 )
 from esphome.core import coroutine_with_priority
+import esphome.final_validate as fv
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -124,7 +124,6 @@ FINAL_VALIDATE_SCHEMA = ota_esphome_final_validate
 @coroutine_with_priority(52.0)
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await ota_to_code(var, config)
     cg.add(var.set_port(config[CONF_PORT]))
     if CONF_PASSWORD in config:
         cg.add(var.set_auth_password(config[CONF_PASSWORD]))
@@ -132,3 +131,4 @@ async def to_code(config):
     cg.add_define("USE_OTA_VERSION", config[CONF_VERSION])
 
     await cg.register_component(var, config)
+    await ota_to_code(var, config)

esphome/components/ethernet/__init__.py

@@ -1,3 +1,4 @@
+import logging
 from esphome import pins
 import esphome.codegen as cg
 from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant
@@ -23,6 +24,7 @@ from esphome.const import (
     CONF_MISO_PIN,
     CONF_MOSI_PIN,
     CONF_PAGE_ID,
+    CONF_POLLING_INTERVAL,
     CONF_RESET_PIN,
     CONF_SPI,
     CONF_STATIC_IP,
@@ -30,13 +32,16 @@ from esphome.const import (
     CONF_TYPE,
     CONF_USE_ADDRESS,
     CONF_VALUE,
+    KEY_CORE,
+    KEY_FRAMEWORK_VERSION,
 )
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE, TimePeriodMilliseconds, coroutine_with_priority
 import esphome.final_validate as fv
 
 CONFLICTS_WITH = ["wifi"]
 DEPENDENCIES = ["esp32"]
 AUTO_LOAD = ["network"]
+LOGGER = logging.getLogger(__name__)
 
 ethernet_ns = cg.esphome_ns.namespace("ethernet")
 PHYRegister = ethernet_ns.struct("PHYRegister")
@@ -63,6 +68,7 @@ ETHERNET_TYPES = {
 }
 
 SPI_ETHERNET_TYPES = ["W5500"]
+SPI_ETHERNET_DEFAULT_POLLING_INTERVAL = TimePeriodMilliseconds(milliseconds=10)
 
 emac_rmii_clock_mode_t = cg.global_ns.enum("emac_rmii_clock_mode_t")
 emac_rmii_clock_gpio_t = cg.global_ns.enum("emac_rmii_clock_gpio_t")
@@ -100,6 +106,24 @@ EthernetComponent = ethernet_ns.class_("EthernetComponent", cg.Component)
 ManualIP = ethernet_ns.struct("ManualIP")
 
 
+def _is_framework_spi_polling_mode_supported():
+    # SPI Ethernet without IRQ feature is added in
+    # esp-idf >= (5.3+ ,5.2.1+, 5.1.4) and arduino-esp32 >= 3.0.0
+    framework_version = CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]
+    if CORE.using_esp_idf:
+        if framework_version >= cv.Version(5, 3, 0):
+            return True
+        if cv.Version(5, 3, 0) > framework_version >= cv.Version(5, 2, 1):
+            return True
+        if cv.Version(5, 2, 0) > framework_version >= cv.Version(5, 1, 4):
+            return True
+        return False
+    if CORE.using_arduino:
+        return framework_version >= cv.Version(3, 0, 0)
+    # fail safe: Unknown framework
+    return False
+
+
 def _validate(config):
     if CONF_USE_ADDRESS not in config:
         if CONF_MANUAL_IP in config:
@@ -107,6 +131,27 @@ def _validate(config):
         else:
             use_address = CORE.name + config[CONF_DOMAIN]
         config[CONF_USE_ADDRESS] = use_address
+    if config[CONF_TYPE] in SPI_ETHERNET_TYPES:
+        if _is_framework_spi_polling_mode_supported():
+            if CONF_POLLING_INTERVAL in config and CONF_INTERRUPT_PIN in config:
+                raise cv.Invalid(
+                    f"Cannot specify more than one of {CONF_INTERRUPT_PIN}, {CONF_POLLING_INTERVAL}"
+                )
+            if CONF_POLLING_INTERVAL not in config and CONF_INTERRUPT_PIN not in config:
+                config[CONF_POLLING_INTERVAL] = SPI_ETHERNET_DEFAULT_POLLING_INTERVAL
+        else:
+            if CONF_POLLING_INTERVAL in config:
+                raise cv.Invalid(
+                    "In this version of the framework "
+                    f"({CORE.target_framework} {CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}), "
+                    f"'{CONF_POLLING_INTERVAL}' is not supported."
+                )
+            if CONF_INTERRUPT_PIN not in config:
+                raise cv.Invalid(
+                    "In this version of the framework "
+                    f"({CORE.target_framework} {CORE.data[KEY_CORE][KEY_FRAMEWORK_VERSION]}), "
+                    f"'{CONF_INTERRUPT_PIN}' is a required option for [ethernet]."
+                )
     return config
 
 
@@ -157,6 +202,11 @@ SPI_SCHEMA = BASE_SCHEMA.extend(
             cv.Optional(CONF_CLOCK_SPEED, default="26.67MHz"): cv.All(
                 cv.frequency, cv.int_range(int(8e6), int(80e6))
             ),
+            # Set default value (SPI_ETHERNET_DEFAULT_POLLING_INTERVAL) at _validate()
+            cv.Optional(CONF_POLLING_INTERVAL): cv.All(
+                cv.positive_time_period_milliseconds,
+                cv.Range(min=TimePeriodMilliseconds(milliseconds=1)),
+            ),
         }
     ),
 )
@@ -234,6 +284,10 @@ async def to_code(config):
         cg.add(var.set_cs_pin(config[CONF_CS_PIN]))
         if CONF_INTERRUPT_PIN in config:
             cg.add(var.set_interrupt_pin(config[CONF_INTERRUPT_PIN]))
+        else:
+            cg.add(var.set_polling_interval(config[CONF_POLLING_INTERVAL]))
+        if _is_framework_spi_polling_mode_supported():
+            cg.add_define("USE_ETHERNET_SPI_POLLING_SUPPORT")
         if CONF_RESET_PIN in config:
             cg.add(var.set_reset_pin(config[CONF_RESET_PIN]))
         cg.add(var.set_clock_speed(config[CONF_CLOCK_SPEED]))

esphome/components/ethernet/ethernet_component.cpp

@@ -116,6 +116,9 @@ void EthernetComponent::setup() {
   eth_w5500_config_t w5500_config = ETH_W5500_DEFAULT_CONFIG(spi_handle);
 #endif
   w5500_config.int_gpio_num = this->interrupt_pin_;
+#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
+  w5500_config.poll_period_ms = this->polling_interval_;
+#endif
   phy_config.phy_addr = this->phy_addr_spi_;
   phy_config.reset_gpio_num = this->reset_pin_;
 
@@ -327,7 +330,14 @@ void EthernetComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  MISO Pin: %u", this->miso_pin_);
   ESP_LOGCONFIG(TAG, "  MOSI Pin: %u", this->mosi_pin_);
   ESP_LOGCONFIG(TAG, "  CS Pin: %u", this->cs_pin_);
-  ESP_LOGCONFIG(TAG, "  IRQ Pin: %u", this->interrupt_pin_);
+#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
+  if (this->polling_interval_ != 0) {
+    ESP_LOGCONFIG(TAG, "  Polling Interval: %lu ms", this->polling_interval_);
+  } else
+#endif
+  {
+    ESP_LOGCONFIG(TAG, "  IRQ Pin: %d", this->interrupt_pin_);
+  }
   ESP_LOGCONFIG(TAG, "  Reset Pin: %d", this->reset_pin_);
   ESP_LOGCONFIG(TAG, "  Clock Speed: %d MHz", this->clock_speed_ / 1000000);
 #else
@@ -536,6 +546,9 @@ void EthernetComponent::set_cs_pin(uint8_t cs_pin) { this->cs_pin_ = cs_pin; }
 void EthernetComponent::set_interrupt_pin(uint8_t interrupt_pin) { this->interrupt_pin_ = interrupt_pin; }
 void EthernetComponent::set_reset_pin(uint8_t reset_pin) { this->reset_pin_ = reset_pin; }
 void EthernetComponent::set_clock_speed(int clock_speed) { this->clock_speed_ = clock_speed; }
+#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
+void EthernetComponent::set_polling_interval(uint32_t polling_interval) { this->polling_interval_ = polling_interval; }
+#endif
 #else
 void EthernetComponent::set_phy_addr(uint8_t phy_addr) { this->phy_addr_ = phy_addr; }
 void EthernetComponent::set_power_pin(int power_pin) { this->power_pin_ = power_pin; }

esphome/components/ethernet/ethernet_component.h

@@ -67,6 +67,9 @@ class EthernetComponent : public Component {
   void set_interrupt_pin(uint8_t interrupt_pin);
   void set_reset_pin(uint8_t reset_pin);
   void set_clock_speed(int clock_speed);
+#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
+  void set_polling_interval(uint32_t polling_interval);
+#endif
 #else
   void set_phy_addr(uint8_t phy_addr);
   void set_power_pin(int power_pin);
@@ -108,10 +111,13 @@ class EthernetComponent : public Component {
   uint8_t miso_pin_;
   uint8_t mosi_pin_;
   uint8_t cs_pin_;
-  uint8_t interrupt_pin_;
+  int interrupt_pin_{-1};
   int reset_pin_{-1};
   int phy_addr_spi_{-1};
   int clock_speed_;
+#ifdef USE_ETHERNET_SPI_POLLING_SUPPORT
+  uint32_t polling_interval_{0};
+#endif
 #else
   uint8_t phy_addr_{0};
   int power_pin_{-1};

esphome/components/font/__init__.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterable
 import functools
 import hashlib
 import logging
@@ -5,6 +6,8 @@ import os
 from pathlib import Path
 import re
 
+import freetype
+import glyphsets
 from packaging import version
 import requests
 
@@ -43,6 +46,18 @@ GlyphData = font_ns.struct("GlyphData")
 CONF_BPP = "bpp"
 CONF_EXTRAS = "extras"
 CONF_FONTS = "fonts"
+CONF_GLYPHSETS = "glyphsets"
+CONF_IGNORE_MISSING_GLYPHS = "ignore_missing_glyphs"
+
+
+# Cache loaded freetype fonts
+class FontCache(dict):
+    def __missing__(self, key):
+        res = self[key] = freetype.Face(key)
+        return res
+
+
+FONT_CACHE = FontCache()
 
 
 def glyph_comparator(x, y):
@@ -59,36 +74,106 @@ def glyph_comparator(x, y):
         return -1
     if len(x_) > len(y_):
         return 1
-    raise cv.Invalid(f"Found duplicate glyph {x}")
+    return 0
 
 
-def validate_glyphs(value):
+def flatten(lists) -> list:
-    if isinstance(value, list):
+    """
-        value = cv.Schema([cv.string])(value)
+    Given a list of lists, flatten it to a single list of all elements of all lists.
-    value = cv.Schema([cv.string])(list(value))
+    This wraps itertools.chain.from_iterable to make it more readable, and return a list
+    rather than a single use iterable.
+    """
+    from itertools import chain
 
-    value.sort(key=functools.cmp_to_key(glyph_comparator))
+    return list(chain.from_iterable(lists))
-    return value
 
 
-font_map = {}
+def check_missing_glyphs(file, codepoints: Iterable, warning: bool = False):
+    """
+    Check that the given font file actually contains the requested glyphs
+    :param file: A Truetype font file
+    :param codepoints: A list of codepoints to check
+    :param warning: If true, log a warning instead of raising an exception
+    """
 
-
+    font = FONT_CACHE[file]
-def merge_glyphs(config):
+    missing = [chr(x) for x in codepoints if font.get_char_index(x) == 0]
-    glyphs = []
+    if missing:
-    glyphs.extend(config[CONF_GLYPHS])
+        # Only list up to 10 missing glyphs
-    font_list = [(EFont(config[CONF_FILE], config[CONF_SIZE], config[CONF_GLYPHS]))]
+        missing.sort(key=functools.cmp_to_key(glyph_comparator))
-    if extras := config.get(CONF_EXTRAS):
+        count = len(missing)
-        extra_fonts = list(
+        missing = missing[:10]
-            map(
+        missing_str = "\n    ".join(
-                lambda x: EFont(x[CONF_FILE], config[CONF_SIZE], x[CONF_GLYPHS]), extras
+            f"{x} ({x.encode('unicode_escape')})" for x in missing
-            )
         )
-        font_list.extend(extra_fonts)
+        if count > 10:
-        for extra in extras:
+            missing_str += f"\n    and {count - 10} more."
-            glyphs.extend(extra[CONF_GLYPHS])
+        message = f"Font {Path(file).name} is missing {count} glyph{'s' if count != 1 else ''}:\n    {missing_str}"
-        validate_glyphs(glyphs)
+        if warning:
-    font_map[config[CONF_ID]] = font_list
+            _LOGGER.warning(message)
+        else:
+            raise cv.Invalid(message)
+
+
+def validate_glyphs(config):
+    """
+    Check for duplicate codepoints, then check that all requested codepoints actually
+    have glyphs defined in the appropriate font file.
+    """
+
+    # Collect all glyph codepoints and flatten to a list of chars
+    glyphspoints = flatten(
+        [x[CONF_GLYPHS] for x in config[CONF_EXTRAS]] + config[CONF_GLYPHS]
+    )
+    # Convert a list of strings to a list of chars (one char strings)
+    glyphspoints = flatten([list(x) for x in glyphspoints])
+    if len(set(glyphspoints)) != len(glyphspoints):
+        duplicates = {x for x in glyphspoints if glyphspoints.count(x) > 1}
+        dup_str = ", ".join(f"{x} ({x.encode('unicode_escape')})" for x in duplicates)
+        raise cv.Invalid(
+            f"Found duplicate glyph{'s' if len(duplicates) != 1 else ''}: {dup_str}"
+        )
+    # convert to codepoints
+    glyphspoints = {ord(x) for x in glyphspoints}
+    fileconf = config[CONF_FILE]
+    setpoints = set(
+        flatten([glyphsets.unicodes_per_glyphset(x) for x in config[CONF_GLYPHSETS]])
+    )
+    # Make setpoints and glyphspoints disjoint
+    setpoints.difference_update(glyphspoints)
+    if fileconf[CONF_TYPE] == TYPE_LOCAL_BITMAP:
+        # Pillow only allows 256 glyphs per bitmap font. Not sure if that is a Pillow limitation
+        # or a file format limitation
+        if any(x >= 256 for x in setpoints.copy().union(glyphspoints)):
+            raise cv.Invalid("Codepoints in bitmap fonts must be in the range 0-255")
+    else:
+        # for TT fonts, check that glyphs are actually present
+        # Check extras against their own font, exclude from parent font codepoints
+        for extra in config[CONF_EXTRAS]:
+            points = {ord(x) for x in flatten(extra[CONF_GLYPHS])}
+            glyphspoints.difference_update(points)
+            setpoints.difference_update(points)
+            check_missing_glyphs(extra[CONF_FILE][CONF_PATH], points)
+
+        # A named glyph that can't be provided is an error
+        check_missing_glyphs(fileconf[CONF_PATH], glyphspoints)
+        # A missing glyph from a set is a warning.
+        if not config[CONF_IGNORE_MISSING_GLYPHS]:
+            check_missing_glyphs(fileconf[CONF_PATH], setpoints, warning=True)
+
+    # Populate the default after the above checks so that use of the default doesn't trigger errors
+    if not config[CONF_GLYPHS] and not config[CONF_GLYPHSETS]:
+        if fileconf[CONF_TYPE] == TYPE_LOCAL_BITMAP:
+            config[CONF_GLYPHS] = [DEFAULT_GLYPHS]
+        else:
+            # set a default glyphset, intersected with what the font actually offers
+            font = FONT_CACHE[fileconf[CONF_PATH]]
+            config[CONF_GLYPHS] = [
+                chr(x)
+                for x in glyphsets.unicodes_per_glyphset(DEFAULT_GLYPHSET)
+                if font.get_char_index(x) != 0
+            ]
+
     return config
 
 
@@ -120,7 +205,7 @@ def validate_truetype_file(value):
         )
     if not any(map(value.lower().endswith, FONT_EXTENSIONS)):
         raise cv.Invalid(f"Only {FONT_EXTENSIONS} files are supported.")
-    return cv.file_(value)
+    return CORE.relative_config_path(cv.file_(value))
 
 
 TYPE_LOCAL = "local"
@@ -139,6 +224,10 @@ LOCAL_BITMAP_SCHEMA = cv.Schema(
     }
 )
 
+FULLPATH_SCHEMA = cv.maybe_simple_value(
+    {cv.Required(CONF_PATH): cv.string}, key=CONF_PATH
+)
+
 CONF_ITALIC = "italic"
 FONT_WEIGHTS = {
     "thin": 100,
@@ -167,13 +256,13 @@ def _compute_local_font_path(value: dict) -> Path:
     return base_dir / key
 
 
-def get_font_path(value, type) -> Path:
+def get_font_path(value, font_type) -> Path:
-    if type == TYPE_GFONTS:
+    if font_type == TYPE_GFONTS:
         name = f"{value[CONF_FAMILY]}@{value[CONF_WEIGHT]}@{value[CONF_ITALIC]}@v1"
         return external_files.compute_local_file_dir(DOMAIN) / f"{name}.ttf"
-    if type == TYPE_WEB:
+    if font_type == TYPE_WEB:
         return _compute_local_font_path(value) / "font.ttf"
-    return None
+    assert False
 
 
 def download_gfont(value):
@@ -203,7 +292,7 @@ def download_gfont(value):
     _LOGGER.debug("download_gfont: ttf_url=%s", ttf_url)
 
     external_files.download_content(ttf_url, path)
-    return value
+    return FULLPATH_SCHEMA(path)
 
 
 def download_web_font(value):
@@ -212,7 +301,7 @@ def download_web_font(value):
 
     external_files.download_content(url, path)
     _LOGGER.debug("download_web_font: path=%s", path)
-    return value
+    return FULLPATH_SCHEMA(path)
 
 
 EXTERNAL_FONT_SCHEMA = cv.Schema(
@@ -225,7 +314,6 @@ EXTERNAL_FONT_SCHEMA = cv.Schema(
     }
 )
 
-
 GFONTS_SCHEMA = cv.All(
     EXTERNAL_FONT_SCHEMA.extend(
         {
@@ -259,10 +347,10 @@ def validate_file_shorthand(value):
         }
         if weight is not None:
             data[CONF_WEIGHT] = weight[1:]
-        return FILE_SCHEMA(data)
+        return font_file_schema(data)
 
     if value.startswith("http://") or value.startswith("https://"):
-        return FILE_SCHEMA(
+        return font_file_schema(
             {
                 CONF_TYPE: TYPE_WEB,
                 CONF_URL: value,
@@ -270,14 +358,15 @@ def validate_file_shorthand(value):
         )
 
     if value.endswith(".pcf") or value.endswith(".bdf"):
-        return FILE_SCHEMA(
+        value = convert_bitmap_to_pillow_font(
-            {
+            CORE.relative_config_path(cv.file_(value))
-                CONF_TYPE: TYPE_LOCAL_BITMAP,
-                CONF_PATH: value,
-            }
         )
+        return {
+            CONF_TYPE: TYPE_LOCAL_BITMAP,
+            CONF_PATH: value,
+        }
 
-    return FILE_SCHEMA(
+    return font_file_schema(
         {
             CONF_TYPE: TYPE_LOCAL,
             CONF_PATH: value,
@@ -295,31 +384,35 @@ TYPED_FILE_SCHEMA = cv.typed_schema(
 )
 
 
-def _file_schema(value):
+def font_file_schema(value):
     if isinstance(value, str):
         return validate_file_shorthand(value)
     return TYPED_FILE_SCHEMA(value)
 
 
-FILE_SCHEMA = cv.All(_file_schema)
+# Default if no glyphs or glyphsets are provided
+DEFAULT_GLYPHSET = "GF_Latin_Kernel"
+# default for bitmap fonts
+DEFAULT_GLYPHS = ' !"%()+=,-.:/?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz<C2><B0>'
 
-DEFAULT_GLYPHS = (
-    ' !"%()+=,-.:/?0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz°'
-)
 CONF_RAW_GLYPH_ID = "raw_glyph_id"
 
 FONT_SCHEMA = cv.Schema(
     {
         cv.Required(CONF_ID): cv.declare_id(Font),
-        cv.Required(CONF_FILE): FILE_SCHEMA,
+        cv.Required(CONF_FILE): font_file_schema,
-        cv.Optional(CONF_GLYPHS, default=DEFAULT_GLYPHS): validate_glyphs,
+        cv.Optional(CONF_GLYPHS, default=[]): cv.ensure_list(cv.string_strict),
+        cv.Optional(CONF_GLYPHSETS, default=[]): cv.ensure_list(
+            cv.one_of(*glyphsets.defined_glyphsets())
+        ),
+        cv.Optional(CONF_IGNORE_MISSING_GLYPHS, default=False): cv.boolean,
         cv.Optional(CONF_SIZE, default=20): cv.int_range(min=1),
         cv.Optional(CONF_BPP, default=1): cv.one_of(1, 2, 4, 8),
-        cv.Optional(CONF_EXTRAS): cv.ensure_list(
+        cv.Optional(CONF_EXTRAS, default=[]): cv.ensure_list(
             cv.Schema(
                 {
-                    cv.Required(CONF_FILE): FILE_SCHEMA,
+                    cv.Required(CONF_FILE): font_file_schema,
-                    cv.Required(CONF_GLYPHS): validate_glyphs,
+                    cv.Required(CONF_GLYPHS): cv.ensure_list(cv.string_strict),
                 }
             )
         ),
@@ -328,7 +421,7 @@ FONT_SCHEMA = cv.Schema(
     },
 )
 
-CONFIG_SCHEMA = cv.All(validate_pillow_installed, FONT_SCHEMA, merge_glyphs)
+CONFIG_SCHEMA = cv.All(validate_pillow_installed, FONT_SCHEMA, validate_glyphs)
 
 
 # PIL doesn't provide a consistent interface for both TrueType and bitmap
@@ -344,7 +437,7 @@ class TrueTypeFontWrapper:
         return offset_x, offset_y
 
     def getmask(self, glyph, **kwargs):
-        return self.font.getmask(glyph, **kwargs)
+        return self.font.getmask(str(glyph), **kwargs)
 
     def getmetrics(self, glyphs):
         return self.font.getmetrics()
@@ -359,7 +452,7 @@ class BitmapFontWrapper:
         return 0, 0
 
     def getmask(self, glyph, **kwargs):
-        return self.font.getmask(glyph, **kwargs)
+        return self.font.getmask(str(glyph), **kwargs)
 
     def getmetrics(self, glyphs):
         max_height = 0
@@ -367,28 +460,20 @@ class BitmapFontWrapper:
             mask = self.getmask(glyph, mode="1")
             _, height = mask.size
             max_height = max(max_height, height)
-        return (max_height, 0)
+        return max_height, 0
 
 
 class EFont:
-    def __init__(self, file, size, glyphs):
+    def __init__(self, file, size, codepoints):
-        self.glyphs = glyphs
+        self.codepoints = codepoints
+        path = file[CONF_PATH]
+        self.name = Path(path).name
         ftype = file[CONF_TYPE]
         if ftype == TYPE_LOCAL_BITMAP:
-            font = load_bitmap_font(CORE.relative_config_path(file[CONF_PATH]))
+            self.font = load_bitmap_font(path)
-        elif ftype == TYPE_LOCAL:
-            path = CORE.relative_config_path(file[CONF_PATH])
-            font = load_ttf_font(path, size)
-        elif ftype in (TYPE_GFONTS, TYPE_WEB):
-            path = get_font_path(file, ftype)
-            font = load_ttf_font(path, size)
         else:
-            raise cv.Invalid(f"Could not load font: unknown type: {ftype}")
+            self.font = load_ttf_font(path, size)
-        self.font = font
+        self.ascent, self.descent = self.font.getmetrics(codepoints)
-        self.ascent, self.descent = font.getmetrics(glyphs)
-
-    def has_glyph(self, glyph):
-        return glyph in self.glyphs
 
 
 def convert_bitmap_to_pillow_font(filepath):
@@ -400,6 +485,7 @@ def convert_bitmap_to_pillow_font(filepath):
 
     copy_file_if_changed(filepath, local_bitmap_font_file)
 
+    local_pil_font_file = local_bitmap_font_file.with_suffix(".pil")
     with open(local_bitmap_font_file, "rb") as fp:
         try:
             try:
@@ -409,28 +495,22 @@ def convert_bitmap_to_pillow_font(filepath):
                 p = BdfFontFile.BdfFontFile(fp)
 
             # Convert to pillow-formatted fonts, which have a .pil and .pbm extension.
-            p.save(local_bitmap_font_file)
+            p.save(local_pil_font_file)
         except (SyntaxError, OSError) as err:
             raise core.EsphomeError(
                 f"Failed to parse as bitmap font: '{filepath}': {err}"
             )
 
-    local_pil_font_file = os.path.splitext(local_bitmap_font_file)[0] + ".pil"
+    return str(local_pil_font_file)
-    return cv.file_(local_pil_font_file)
 
 
 def load_bitmap_font(filepath):
     from PIL import ImageFont
 
-    # Convert bpf and pcf files to pillow fonts, first.
-    pil_font_path = convert_bitmap_to_pillow_font(filepath)
-
     try:
-        font = ImageFont.load(str(pil_font_path))
+        font = ImageFont.load(str(filepath))
     except Exception as e:
-        raise core.EsphomeError(
+        raise core.EsphomeError(f"Failed to load bitmap font file: {filepath}: {e}")
-            f"Failed to load bitmap font file: {pil_font_path} : {e}"
-        )
 
     return BitmapFontWrapper(font)
 
@@ -441,7 +521,7 @@ def load_ttf_font(path, size):
     try:
         font = ImageFont.truetype(str(path), size)
     except Exception as e:
-        raise core.EsphomeError(f"Could not load truetype file {path}: {e}")
+        raise core.EsphomeError(f"Could not load TrueType file {path}: {e}")
 
     return TrueTypeFontWrapper(font)
 
@@ -456,14 +536,35 @@ class GlyphInfo:
 
 
 async def to_code(config):
-    glyph_to_font_map = {}
+    """
-    font_list = font_map[config[CONF_ID]]
+    Collect all glyph codepoints, construct a map from a codepoint to a font file.
-    glyphs = []
+    Codepoints are either explicit (glyphs key in top level or extras) or part of a glyphset.
-    for font in font_list:
+    Codepoints listed in extras use the extra font and override codepoints from glyphsets.
-        glyphs.extend(font.glyphs)
+    Achieve this by processing the base codepoints first, then the extras
-        for glyph in font.glyphs:
+    """
-            glyph_to_font_map[glyph] = font
+
-    glyphs.sort(key=functools.cmp_to_key(glyph_comparator))
+    # get the codepoints from glyphsets and flatten to a set of chrs.
+    point_set: set[str] = {
+        chr(x)
+        for x in flatten(
+            [glyphsets.unicodes_per_glyphset(x) for x in config[CONF_GLYPHSETS]]
+        )
+    }
+    # get the codepoints from the glyphs key, flatten to a list of chrs and combine with the points from glyphsets
+    point_set.update(flatten(config[CONF_GLYPHS]))
+    size = config[CONF_SIZE]
+    # Create the codepoint to font file map
+    base_font = EFont(config[CONF_FILE], size, point_set)
+    point_font_map: dict[str, EFont] = {c: base_font for c in point_set}
+    # process extras, updating the map and extending the codepoint list
+    for extra in config[CONF_EXTRAS]:
+        extra_points = flatten(extra[CONF_GLYPHS])
+        point_set.update(extra_points)
+        extra_font = EFont(extra[CONF_FILE], size, extra_points)
+        point_font_map.update({c: extra_font for c in extra_points})
+
+    codepoints = list(point_set)
+    codepoints.sort(key=functools.cmp_to_key(glyph_comparator))
     glyph_args = {}
     data = []
     bpp = config[CONF_BPP]
@@ -473,10 +574,11 @@ async def to_code(config):
     else:
         mode = "L"
         scale = 256 // (1 << bpp)
-    for glyph in glyphs:
+    # create the data array for all glyphs
-        font = glyph_to_font_map[glyph].font
+    for codepoint in codepoints:
-        mask = font.getmask(glyph, mode=mode)
+        font = point_font_map[codepoint]
-        offset_x, offset_y = font.getoffset(glyph)
+        mask = font.font.getmask(codepoint, mode=mode)
+        offset_x, offset_y = font.font.getoffset(codepoint)
         width, height = mask.size
         glyph_data = [0] * ((height * width * bpp + 7) // 8)
         pos = 0
@@ -487,31 +589,34 @@ async def to_code(config):
                     if pixel & (1 << (bpp - bit_num - 1)):
                         glyph_data[pos // 8] |= 0x80 >> (pos % 8)
                     pos += 1
-        glyph_args[glyph] = GlyphInfo(len(data), offset_x, offset_y, width, height)
+        glyph_args[codepoint] = GlyphInfo(len(data), offset_x, offset_y, width, height)
         data += glyph_data
 
     rhs = [HexInt(x) for x in data]
     prog_arr = cg.progmem_array(config[CONF_RAW_DATA_ID], rhs)
 
+    # Create the glyph table that points to data in the above array.
     glyph_initializer = []
-    for glyph in glyphs:
+    for codepoint in codepoints:
         glyph_initializer.append(
             cg.StructInitializer(
                 GlyphData,
                 (
                     "a_char",
-                    cg.RawExpression(f"(const uint8_t *){cpp_string_escape(glyph)}"),
+                    cg.RawExpression(
+                        f"(const uint8_t *){cpp_string_escape(codepoint)}"
+                    ),
                 ),
                 (
                     "data",
                     cg.RawExpression(
-                        f"{str(prog_arr)} + {str(glyph_args[glyph].data_len)}"
+                        f"{str(prog_arr)} + {str(glyph_args[codepoint].data_len)}"
                     ),
                 ),
-                ("offset_x", glyph_args[glyph].offset_x),
+                ("offset_x", glyph_args[codepoint].offset_x),
-                ("offset_y", glyph_args[glyph].offset_y),
+                ("offset_y", glyph_args[codepoint].offset_y),
-                ("width", glyph_args[glyph].width),
+                ("width", glyph_args[codepoint].width),
-                ("height", glyph_args[glyph].height),
+                ("height", glyph_args[codepoint].height),
             )
         )
 
@@ -521,7 +626,7 @@ async def to_code(config):
         config[CONF_ID],
         glyphs,
         len(glyph_initializer),
-        font_list[0].ascent,
+        base_font.ascent,
-        font_list[0].ascent + font_list[0].descent,
+        base_font.ascent + base_font.descent,
         bpp,
     )

esphome/components/gp8403/output/__init__.py

@@ -16,7 +16,7 @@ CONFIG_SCHEMA = output.FLOAT_OUTPUT_SCHEMA.extend(
     {
         cv.GenerateID(): cv.declare_id(GP8403Output),
         cv.GenerateID(CONF_GP8403_ID): cv.use_id(GP8403),
-        cv.Required(CONF_CHANNEL): cv.one_of(0, 1),
+        cv.Required(CONF_CHANNEL): cv.int_range(min=0, max=1),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 

esphome/components/host/__init__.py

@@ -16,7 +16,7 @@ from .const import KEY_HOST
 from .gpio import host_pin_to_code  # noqa
 
 CODEOWNERS = ["@esphome/core", "@clydebarrow"]
-AUTO_LOAD = ["network"]
+AUTO_LOAD = ["network", "preferences"]
 
 
 def set_core_data(config):

esphome/components/host/gpio.py

@@ -1,5 +1,8 @@
 import logging
 
+from esphome import pins
+import esphome.codegen as cg
+import esphome.config_validation as cv
 from esphome.const import (
     CONF_ID,
     CONF_INPUT,
@@ -11,9 +14,6 @@ from esphome.const import (
     CONF_PULLDOWN,
     CONF_PULLUP,
 )
-from esphome import pins
-import esphome.config_validation as cv
-import esphome.codegen as cg
 
 from .const import host_ns
 
@@ -28,8 +28,10 @@ def _translate_pin(value):
             "This variable only supports pin numbers, not full pin schemas "
             "(with inverted and mode)."
         )
-    if isinstance(value, int):
+    if isinstance(value, int) and not isinstance(value, bool):
         return value
+    if not isinstance(value, str):
+        raise cv.Invalid(f"Invalid pin number: {value}")
     try:
         return int(value)
     except ValueError:

esphome/components/http_request/__init__.py

@@ -6,6 +6,7 @@ from esphome.const import (
     CONF_ESP8266_DISABLE_SSL_SUPPORT,
     CONF_ID,
     CONF_METHOD,
+    CONF_ON_ERROR,
     CONF_TIMEOUT,
     CONF_TRIGGER_ID,
     CONF_URL,
@@ -185,6 +186,13 @@ HTTP_REQUEST_ACTION_SCHEMA = cv.Schema(
         cv.Optional(CONF_ON_RESPONSE): automation.validate_automation(
             {cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(HttpRequestResponseTrigger)}
         ),
+        cv.Optional(CONF_ON_ERROR): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                    automation.Trigger.template()
+                )
+            }
+        ),
         cv.Optional(CONF_MAX_RESPONSE_BUFFER_SIZE, default="1kB"): cv.validate_bytes,
     }
 )
@@ -272,5 +280,9 @@ async def http_request_action_to_code(config, action_id, template_arg, args):
             ],
             conf,
         )
+    for conf in config.get(CONF_ON_ERROR, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID])
+        cg.add(var.register_error_trigger(trigger))
+        await automation.build_automation(trigger, [], conf)
 
     return var

esphome/components/http_request/http_request.h

@@ -22,6 +22,63 @@ struct Header {
   const char *value;
 };
 
+// Some common HTTP status codes
+enum HttpStatus {
+  HTTP_STATUS_OK = 200,
+  HTTP_STATUS_NO_CONTENT = 204,
+  HTTP_STATUS_PARTIAL_CONTENT = 206,
+
+  /* 3xx - Redirection */
+  HTTP_STATUS_MULTIPLE_CHOICES = 300,
+  HTTP_STATUS_MOVED_PERMANENTLY = 301,
+  HTTP_STATUS_FOUND = 302,
+  HTTP_STATUS_SEE_OTHER = 303,
+  HTTP_STATUS_NOT_MODIFIED = 304,
+  HTTP_STATUS_TEMPORARY_REDIRECT = 307,
+  HTTP_STATUS_PERMANENT_REDIRECT = 308,
+
+  /* 4XX - CLIENT ERROR */
+  HTTP_STATUS_BAD_REQUEST = 400,
+  HTTP_STATUS_UNAUTHORIZED = 401,
+  HTTP_STATUS_FORBIDDEN = 403,
+  HTTP_STATUS_NOT_FOUND = 404,
+  HTTP_STATUS_METHOD_NOT_ALLOWED = 405,
+  HTTP_STATUS_NOT_ACCEPTABLE = 406,
+  HTTP_STATUS_LENGTH_REQUIRED = 411,
+
+  /* 5xx - Server Error */
+  HTTP_STATUS_INTERNAL_ERROR = 500
+};
+
+/**
+ * @brief Returns true if the HTTP status code is a redirect.
+ *
+ * @param status the HTTP status code to check
+ * @return true if the status code is a redirect, false otherwise
+ */
+inline bool is_redirect(int const status) {
+  switch (status) {
+    case HTTP_STATUS_MOVED_PERMANENTLY:
+    case HTTP_STATUS_FOUND:
+    case HTTP_STATUS_SEE_OTHER:
+    case HTTP_STATUS_TEMPORARY_REDIRECT:
+    case HTTP_STATUS_PERMANENT_REDIRECT:
+      return true;
+    default:
+      return false;
+  }
+}
+
+/**
+ * @brief Checks if the given HTTP status code indicates a successful request.
+ *
+ * A successful request is one where the status code is in the range 200-299
+ *
+ * @param status the HTTP status code to check
+ * @return true if the status code indicates a successful request, false otherwise
+ */
+inline bool is_success(int const status) { return status >= HTTP_STATUS_OK && status < HTTP_STATUS_MULTIPLE_CHOICES; }
+
 class HttpRequestComponent;
 
 class HttpContainer : public Parented<HttpRequestComponent> {
@@ -78,8 +135,8 @@ class HttpRequestComponent : public Component {
 
  protected:
   const char *useragent_{nullptr};
-  bool follow_redirects_;
+  bool follow_redirects_{};
-  uint16_t redirect_limit_;
+  uint16_t redirect_limit_{};
   uint16_t timeout_{4500};
   uint32_t watchdog_timeout_{0};
 };
@@ -100,6 +157,8 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
 
   void register_response_trigger(HttpRequestResponseTrigger *trigger) { this->response_triggers_.push_back(trigger); }
 
+  void register_error_trigger(Trigger<> *trigger) { this->error_triggers_.push_back(trigger); }
+
   void set_max_response_buffer_size(size_t max_response_buffer_size) {
     this->max_response_buffer_size_ = max_response_buffer_size;
   }
@@ -129,6 +188,8 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
     auto container = this->parent_->start(this->url_.value(x...), this->method_.value(x...), body, headers);
 
     if (container == nullptr) {
+      for (auto *trigger : this->error_triggers_)
+        trigger->trigger();
       return;
     }
 
@@ -180,7 +241,8 @@ template<typename... Ts> class HttpRequestSendAction : public Action<Ts...> {
   std::map<const char *, TemplatableValue<const char *, Ts...>> headers_{};
   std::map<const char *, TemplatableValue<std::string, Ts...>> json_{};
   std::function<void(Ts..., JsonObject)> json_func_{nullptr};
-  std::vector<HttpRequestResponseTrigger *> response_triggers_;
+  std::vector<HttpRequestResponseTrigger *> response_triggers_{};
+  std::vector<Trigger<> *> error_triggers_{};
 
   size_t max_response_buffer_size_{SIZE_MAX};
 };

esphome/components/http_request/http_request_arduino.cpp

@@ -104,7 +104,9 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
   static const size_t HEADER_COUNT = sizeof(header_keys) / sizeof(header_keys[0]);
   container->client_.collectHeaders(header_keys, HEADER_COUNT);
 
+  App.feed_wdt();
   container->status_code = container->client_.sendRequest(method.c_str(), body.c_str());
+  App.feed_wdt();
   if (container->status_code < 0) {
     ESP_LOGW(TAG, "HTTP Request failed; URL: %s; Error: %s", url.c_str(),
              HTTPClient::errorToString(container->status_code).c_str());
@@ -113,11 +115,10 @@ std::shared_ptr<HttpContainer> HttpRequestArduino::start(std::string url, std::s
     return nullptr;
   }
 
-  if (container->status_code < 200 || container->status_code >= 300) {
+  if (!is_success(container->status_code)) {
     ESP_LOGE(TAG, "HTTP Request failed; URL: %s; Code: %d", url.c_str(), container->status_code);
     this->status_momentary_error("failed", 1000);
-    container->end();
+    // Still return the container, so it can be used to get the status code and error message
-    return nullptr;
   }
 
   int content_length = container->client_.getSize();

esphome/components/http_request/http_request_idf.cpp

@@ -6,7 +6,6 @@
 #include "esphome/components/watchdog/watchdog.h"
 
 #include "esphome/core/application.h"
-#include "esphome/core/defines.h"
 #include "esphome/core/log.h"
 
 #if CONFIG_MBEDTLS_CERTIFICATE_BUNDLE
@@ -118,20 +117,17 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
     return nullptr;
   }
 
-  auto is_ok = [](int code) { return code >= HttpStatus_Ok && code < HttpStatus_MultipleChoices; };
+  App.feed_wdt();
-
   container->content_length = esp_http_client_fetch_headers(client);
+  App.feed_wdt();
   container->status_code = esp_http_client_get_status_code(client);
-  if (is_ok(container->status_code)) {
+  App.feed_wdt();
+  if (is_success(container->status_code)) {
     container->duration_ms = millis() - start;
     return container;
   }
 
   if (this->follow_redirects_) {
-    auto is_redirect = [](int code) {
-      return code == HttpStatus_MovedPermanently || code == HttpStatus_Found || code == HttpStatus_SeeOther ||
-             code == HttpStatus_TemporaryRedirect || code == HttpStatus_PermanentRedirect;
-    };
     auto num_redirects = this->redirect_limit_;
     while (is_redirect(container->status_code) && num_redirects > 0) {
       err = esp_http_client_set_redirection(client);
@@ -142,9 +138,9 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
         return nullptr;
       }
 #if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_VERBOSE
-      char url[256]{};
+      char redirect_url[256]{};
-      if (esp_http_client_get_url(client, url, sizeof(url) - 1) == ESP_OK) {
+      if (esp_http_client_get_url(client, redirect_url, sizeof(redirect_url) - 1) == ESP_OK) {
-        ESP_LOGV(TAG, "redirecting to url: %s", url);
+        ESP_LOGV(TAG, "redirecting to url: %s", redirect_url);
       }
 #endif
       err = esp_http_client_open(client, 0);
@@ -155,9 +151,12 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
         return nullptr;
       }
 
+      App.feed_wdt();
       container->content_length = esp_http_client_fetch_headers(client);
+      App.feed_wdt();
       container->status_code = esp_http_client_get_status_code(client);
-      if (is_ok(container->status_code)) {
+      App.feed_wdt();
+      if (is_success(container->status_code)) {
         container->duration_ms = millis() - start;
         return container;
       }
@@ -172,8 +171,7 @@ std::shared_ptr<HttpContainer> HttpRequestIDF::start(std::string url, std::strin
 
   ESP_LOGE(TAG, "HTTP Request failed; URL: %s; Code: %d", url.c_str(), container->status_code);
   this->status_momentary_error("failed", 1000);
-  esp_http_client_cleanup(client);
+  return container;
-  return nullptr;
 }
 
 int HttpContainerIDF::read(uint8_t *buf, size_t max_len) {

esphome/components/http_request/ota/ota_http_request.cpp

@@ -106,7 +106,7 @@ uint8_t OtaHttpRequestComponent::do_ota_() {
 
   auto container = this->parent_->get(url_with_auth);
 
-  if (container == nullptr) {
+  if (container == nullptr || container->status_code != HTTP_STATUS_OK) {
     return OTA_CONNECTION_ERROR;
   }
 

esphome/components/http_request/update/http_request_update.cpp

@@ -31,7 +31,7 @@ void HttpRequestUpdate::setup() {
 void HttpRequestUpdate::update() {
   auto container = this->request_parent_->get(this->source_url_);
 
-  if (container == nullptr) {
+  if (container == nullptr || container->status_code != HTTP_STATUS_OK) {
     std::string msg = str_sprintf("Failed to fetch manifest from %s", this->source_url_.c_str());
     this->status_set_error(msg.c_str());
     return;

esphome/components/i2c_device/__init__.py

@@ -0,0 +1,26 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c
+from esphome.const import CONF_ID
+
+DEPENDENCIES = ["i2c"]
+CODEOWNERS = ["@gabest11"]
+MULTI_CONF = True
+
+i2c_device_ns = cg.esphome_ns.namespace("i2c_device")
+
+I2CDeviceComponent = i2c_device_ns.class_(
+    "I2CDeviceComponent", cg.Component, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_ID): cv.declare_id(I2CDeviceComponent),
+    }
+).extend(i2c.i2c_device_schema(None))
+
+
+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)

esphome/components/i2c_device/i2c_device.cpp

@@ -0,0 +1,17 @@
+#include "i2c_device.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+#include <cinttypes>
+
+namespace esphome {
+namespace i2c_device {
+
+static const char *const TAG = "i2c_device";
+
+void I2CDeviceComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "I2CDevice");
+  LOG_I2C_DEVICE(this);
+}
+
+}  // namespace i2c_device
+}  // namespace esphome

esphome/components/i2c_device/i2c_device.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace i2c_device {
+
+class I2CDeviceComponent : public Component, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+};
+
+}  // namespace i2c_device
+}  // namespace esphome

esphome/components/i2s_audio/__init__.py

@@ -8,7 +8,7 @@ from esphome.components.esp32.const import (
     VARIANT_ESP32S3,
 )
 import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE
+from esphome.const import CONF_BITS_PER_SAMPLE, CONF_CHANNEL, CONF_ID, CONF_SAMPLE_RATE
 from esphome.cpp_generator import MockObjClass
 import esphome.final_validate as fv
 
@@ -25,13 +25,11 @@ CONF_I2S_LRCLK_PIN = "i2s_lrclk_pin"
 CONF_I2S_AUDIO = "i2s_audio"
 CONF_I2S_AUDIO_ID = "i2s_audio_id"
 
-CONF_BITS_PER_SAMPLE = "bits_per_sample"
 CONF_I2S_MODE = "i2s_mode"
 CONF_PRIMARY = "primary"
 CONF_SECONDARY = "secondary"
 
 CONF_USE_APLL = "use_apll"
-CONF_BITS_PER_SAMPLE = "bits_per_sample"
 CONF_BITS_PER_CHANNEL = "bits_per_channel"
 CONF_MONO = "mono"
 CONF_LEFT = "left"

esphome/components/i2s_audio/speaker/__init__.py

@@ -17,16 +17,17 @@ from .. import (
 )
 
 AUTO_LOAD = ["audio"]
-CODEOWNERS = ["@jesserockz"]
+CODEOWNERS = ["@jesserockz", "@kahrendt"]
 DEPENDENCIES = ["i2s_audio"]
 
 I2SAudioSpeaker = i2s_audio_ns.class_(
     "I2SAudioSpeaker", cg.Component, speaker.Speaker, I2SAudioOut
 )
 
-
+CONF_BUFFER_DURATION = "buffer_duration"
 CONF_DAC_TYPE = "dac_type"
 CONF_I2S_COMM_FMT = "i2s_comm_fmt"
+CONF_NEVER = "never"
 
 i2s_dac_mode_t = cg.global_ns.enum("i2s_dac_mode_t")
 INTERNAL_DAC_OPTIONS = {
@@ -73,8 +74,12 @@ BASE_SCHEMA = (
     .extend(
         {
             cv.Optional(
-                CONF_TIMEOUT, default="500ms"
+                CONF_BUFFER_DURATION, default="500ms"
             ): cv.positive_time_period_milliseconds,
+            cv.Optional(CONF_TIMEOUT, default="500ms"): cv.Any(
+                cv.positive_time_period_milliseconds,
+                cv.one_of(CONF_NEVER, lower=True),
+            ),
         }
     )
     .extend(cv.COMPONENT_SCHEMA)
@@ -116,4 +121,6 @@ async def to_code(config):
     else:
         cg.add(var.set_dout_pin(config[CONF_I2S_DOUT_PIN]))
         cg.add(var.set_i2s_comm_fmt(config[CONF_I2S_COMM_FMT]))
-    cg.add(var.set_timeout(config[CONF_TIMEOUT]))
+    if config[CONF_TIMEOUT] != CONF_NEVER:
+        cg.add(var.set_timeout(config[CONF_TIMEOUT]))
+    cg.add(var.set_buffer_duration(config[CONF_BUFFER_DURATION]))

esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp

@@ -13,25 +13,27 @@
 namespace esphome {
 namespace i2s_audio {
 
-static const size_t DMA_BUFFER_SIZE = 512;
+static const uint8_t DMA_BUFFER_DURATION_MS = 15;
 static const size_t DMA_BUFFERS_COUNT = 4;
-static const size_t FRAMES_IN_ALL_DMA_BUFFERS = DMA_BUFFER_SIZE * DMA_BUFFERS_COUNT;
+
-static const size_t RING_BUFFER_SAMPLES = 8192;
+static const size_t TASK_DELAY_MS = DMA_BUFFER_DURATION_MS * DMA_BUFFERS_COUNT / 2;
-static const size_t TASK_DELAY_MS = 10;
+
 static const size_t TASK_STACK_SIZE = 4096;
 static const ssize_t TASK_PRIORITY = 23;
 
+static const size_t I2S_EVENT_QUEUE_COUNT = DMA_BUFFERS_COUNT + 1;
+
 static const char *const TAG = "i2s_audio.speaker";
 
 enum SpeakerEventGroupBits : uint32_t {
-  COMMAND_START = (1 << 0),                           // Starts the main task purpose
+  COMMAND_START = (1 << 0),            // starts the speaker task
-  COMMAND_STOP = (1 << 1),                            // stops the main task
+  COMMAND_STOP = (1 << 1),             // stops the speaker task
-  COMMAND_STOP_GRACEFULLY = (1 << 2),                 // Stops the task once all data has been written
+  COMMAND_STOP_GRACEFULLY = (1 << 2),  // Stops the speaker task once all data has been written
-  MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE = (1 << 5),  // Locks the ring buffer when not set
   STATE_STARTING = (1 << 10),
   STATE_RUNNING = (1 << 11),
   STATE_STOPPING = (1 << 12),
   STATE_STOPPED = (1 << 13),
+  ERR_INVALID_FORMAT = (1 << 14),
   ERR_TASK_FAILED_TO_START = (1 << 15),
   ERR_ESP_INVALID_STATE = (1 << 16),
   ERR_ESP_INVALID_ARG = (1 << 17),
@@ -90,9 +92,7 @@ static const std::vector<int16_t> Q15_VOLUME_SCALING_FACTORS = {
 void I2SAudioSpeaker::setup() {
   ESP_LOGCONFIG(TAG, "Setting up I2S Audio Speaker...");
 
-  if (this->event_group_ == nullptr) {
+  this->event_group_ = xEventGroupCreate();
-    this->event_group_ = xEventGroupCreate();
-  }
 
   if (this->event_group_ == nullptr) {
     ESP_LOGE(TAG, "Failed to create event group");
@@ -104,16 +104,6 @@ void I2SAudioSpeaker::setup() {
 void I2SAudioSpeaker::loop() {
   uint32_t event_group_bits = xEventGroupGetBits(this->event_group_);
 
-  if (event_group_bits & SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START) {
-    this->status_set_error("Failed to start speaker task");
-  }
-
-  if (event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS) {
-    uint32_t error_bits = event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS;
-    ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(err_bit_to_esp_err(error_bits)));
-    this->status_set_warning();
-  }
-
   if (event_group_bits & SpeakerEventGroupBits::STATE_STARTING) {
     ESP_LOGD(TAG, "Starting Speaker");
     this->state_ = speaker::STATE_STARTING;
@@ -139,12 +129,64 @@ void I2SAudioSpeaker::loop() {
       this->speaker_task_handle_ = nullptr;
     }
   }
+
+  if (event_group_bits & SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START) {
+    this->status_set_error("Failed to start speaker task");
+    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::ERR_TASK_FAILED_TO_START);
+  }
+
+  if (event_group_bits & SpeakerEventGroupBits::ERR_INVALID_FORMAT) {
+    this->status_set_error("Failed to adjust I2S bus to match the incoming audio");
+    ESP_LOGE(TAG,
+             "Incompatible audio format: sample rate = %" PRIu32 ", channels = %" PRIu8 ", bits per sample = %" PRIu8,
+             this->audio_stream_info_.sample_rate, this->audio_stream_info_.channels,
+             this->audio_stream_info_.bits_per_sample);
+  }
+
+  if (event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS) {
+    uint32_t error_bits = event_group_bits & SpeakerEventGroupBits::ALL_ERR_ESP_BITS;
+    ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(err_bit_to_esp_err(error_bits)));
+    this->status_set_warning();
+  }
 }
 
 void I2SAudioSpeaker::set_volume(float volume) {
   this->volume_ = volume;
-  ssize_t decibel_index = remap<ssize_t, float>(volume, 0.0f, 1.0f, 0, Q15_VOLUME_SCALING_FACTORS.size() - 1);
+#ifdef USE_AUDIO_DAC
-  this->q15_volume_factor_ = Q15_VOLUME_SCALING_FACTORS[decibel_index];
+  if (this->audio_dac_ != nullptr) {
+    if (volume > 0.0) {
+      this->audio_dac_->set_mute_off();
+    }
+    this->audio_dac_->set_volume(volume);
+  } else
+#endif
+  {
+    // Fallback to software volume control by using a Q15 fixed point scaling factor
+    ssize_t decibel_index = remap<ssize_t, float>(volume, 0.0f, 1.0f, 0, Q15_VOLUME_SCALING_FACTORS.size() - 1);
+    this->q15_volume_factor_ = Q15_VOLUME_SCALING_FACTORS[decibel_index];
+  }
+}
+
+void I2SAudioSpeaker::set_mute_state(bool mute_state) {
+  this->mute_state_ = mute_state;
+#ifdef USE_AUDIO_DAC
+  if (this->audio_dac_) {
+    if (mute_state) {
+      this->audio_dac_->set_mute_on();
+    } else {
+      this->audio_dac_->set_mute_off();
+    }
+  } else
+#endif
+  {
+    if (mute_state) {
+      // Fallback to software volume control and scale by 0
+      this->q15_volume_factor_ = 0;
+    } else {
+      // Revert to previous volume when unmuting
+      this->set_volume(this->volume_);
+    }
+  }
 }
 
 size_t I2SAudioSpeaker::play(const uint8_t *data, size_t length, TickType_t ticks_to_wait) {
@@ -156,23 +198,17 @@ size_t I2SAudioSpeaker::play(const uint8_t *data, size_t length, TickType_t tick
     this->start();
   }
 
-  // Wait for the ring buffer to be available
+  size_t bytes_written = 0;
-  uint32_t event_bits =
+  if ((this->state_ == speaker::STATE_RUNNING) && (this->audio_ring_buffer_.use_count() == 1)) {
-      xEventGroupWaitBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE, pdFALSE,
+    // Only one owner of the ring buffer (the speaker task), so the ring buffer is allocated and no other components are
-                          pdFALSE, pdMS_TO_TICKS(TASK_DELAY_MS));
+    // attempting to write to it.
 
-  if (event_bits & SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE) {
+    // Temporarily share ownership of the ring buffer so it won't be deallocated while writing
-    // Ring buffer is available to write
+    std::shared_ptr<RingBuffer> temp_ring_buffer = this->audio_ring_buffer_;
-
+    bytes_written = temp_ring_buffer->write_without_replacement((void *) data, length, ticks_to_wait);
-    // Lock the ring buffer, write to it, then unlock it
-    xEventGroupClearBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
-    size_t bytes_written = this->audio_ring_buffer_->write_without_replacement((void *) data, length, ticks_to_wait);
-    xEventGroupSetBits(this->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
-
-    return bytes_written;
   }
 
-  return 0;
+  return bytes_written;
 }
 
 bool I2SAudioSpeaker::has_buffered_data() const {
@@ -203,10 +239,12 @@ void I2SAudioSpeaker::speaker_task(void *params) {
   const ssize_t bytes_per_sample = audio_stream_info.get_bytes_per_sample();
   const uint8_t number_of_channels = audio_stream_info.channels;
 
-  const size_t dma_buffers_size = FRAMES_IN_ALL_DMA_BUFFERS * bytes_per_sample * number_of_channels;
+  const size_t dma_buffers_size = DMA_BUFFERS_COUNT * DMA_BUFFER_DURATION_MS * this_speaker->sample_rate_ / 1000 *
+                                  bytes_per_sample * number_of_channels;
+  const size_t ring_buffer_size =
+      this_speaker->buffer_duration_ms_ * this_speaker->sample_rate_ / 1000 * bytes_per_sample * number_of_channels;
 
-  if (this_speaker->send_esp_err_to_event_group_(
+  if (this_speaker->send_esp_err_to_event_group_(this_speaker->allocate_buffers_(dma_buffers_size, ring_buffer_size))) {
-          this_speaker->allocate_buffers_(dma_buffers_size, RING_BUFFER_SAMPLES * bytes_per_sample))) {
     // Failed to allocate buffers
     xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::ERR_ESP_NO_MEM);
     this_speaker->delete_task_(dma_buffers_size);
@@ -215,9 +253,6 @@ void I2SAudioSpeaker::speaker_task(void *params) {
   if (this_speaker->send_esp_err_to_event_group_(this_speaker->start_i2s_driver_())) {
     // Failed to start I2S driver
     this_speaker->delete_task_(dma_buffers_size);
-  } else {
-    // Ring buffer is allocated, so indicate its can be written to
-    xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE);
   }
 
   if (!this_speaker->send_esp_err_to_event_group_(this_speaker->reconfigure_i2s_stream_info_(audio_stream_info))) {
@@ -227,8 +262,10 @@ void I2SAudioSpeaker::speaker_task(void *params) {
 
     bool stop_gracefully = false;
     uint32_t last_data_received_time = millis();
+    bool tx_dma_underflow = false;
 
-    while ((millis() - last_data_received_time) <= this_speaker->timeout_) {
+    while (!this_speaker->timeout_.has_value() ||
+           (millis() - last_data_received_time) <= this_speaker->timeout_.value()) {
       event_group_bits = xEventGroupGetBits(this_speaker->event_group_);
 
       if (event_group_bits & SpeakerEventGroupBits::COMMAND_STOP) {
@@ -238,12 +275,18 @@ void I2SAudioSpeaker::speaker_task(void *params) {
         stop_gracefully = true;
       }
 
+      i2s_event_t i2s_event;
+      while (xQueueReceive(this_speaker->i2s_event_queue_, &i2s_event, 0)) {
+        if (i2s_event.type == I2S_EVENT_TX_Q_OVF) {
+          tx_dma_underflow = true;
+        }
+      }
+
       size_t bytes_to_read = dma_buffers_size;
       size_t bytes_read = this_speaker->audio_ring_buffer_->read((void *) this_speaker->data_buffer_, bytes_to_read,
                                                                  pdMS_TO_TICKS(TASK_DELAY_MS));
 
       if (bytes_read > 0) {
-        last_data_received_time = millis();
         size_t bytes_written = 0;
 
         if ((audio_stream_info.bits_per_sample == 16) && (this_speaker->q15_volume_factor_ < INT16_MAX)) {
@@ -264,23 +307,23 @@ void I2SAudioSpeaker::speaker_task(void *params) {
         if (bytes_written != bytes_read) {
           xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::ERR_ESP_INVALID_SIZE);
         }
-
+        tx_dma_underflow = false;
+        last_data_received_time = millis();
       } else {
         // No data received
-
+        if (stop_gracefully && tx_dma_underflow) {
-        if (stop_gracefully) {
           break;
         }
-
-        i2s_zero_dma_buffer(this_speaker->parent_->get_port());
       }
     }
+  } else {
+    // Couldn't configure the I2S port to be compatible with the incoming audio
+    xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::ERR_INVALID_FORMAT);
   }
   i2s_zero_dma_buffer(this_speaker->parent_->get_port());
 
   xEventGroupSetBits(this_speaker->event_group_, SpeakerEventGroupBits::STATE_STOPPING);
 
-  i2s_stop(this_speaker->parent_->get_port());
   i2s_driver_uninstall(this_speaker->parent_->get_port());
 
   this_speaker->parent_->unlock();
@@ -288,7 +331,7 @@ void I2SAudioSpeaker::speaker_task(void *params) {
 }
 
 void I2SAudioSpeaker::start() {
-  if (this->is_failed())
+  if (!this->is_ready() || this->is_failed() || this->status_has_error())
     return;
   if ((this->state_ == speaker::STATE_STARTING) || (this->state_ == speaker::STATE_RUNNING))
     return;
@@ -356,8 +399,8 @@ esp_err_t I2SAudioSpeaker::allocate_buffers_(size_t data_buffer_size, size_t rin
     return ESP_ERR_NO_MEM;
   }
 
-  if (this->audio_ring_buffer_ == nullptr) {
+  if (this->audio_ring_buffer_.use_count() == 0) {
-    // Allocate ring buffer
+    // Allocate ring buffer. Uses a shared_ptr to ensure it isn't improperly deallocated.
     this->audio_ring_buffer_ = RingBuffer::create(ring_buffer_size);
   }
 
@@ -373,6 +416,8 @@ esp_err_t I2SAudioSpeaker::start_i2s_driver_() {
     return ESP_ERR_INVALID_STATE;
   }
 
+  int dma_buffer_length = DMA_BUFFER_DURATION_MS * this->sample_rate_ / 1000;
+
   i2s_driver_config_t config = {
     .mode = (i2s_mode_t) (this->i2s_mode_ | I2S_MODE_TX),
     .sample_rate = this->sample_rate_,
@@ -381,7 +426,7 @@ esp_err_t I2SAudioSpeaker::start_i2s_driver_() {
     .communication_format = this->i2s_comm_fmt_,
     .intr_alloc_flags = ESP_INTR_FLAG_LEVEL1,
     .dma_buf_count = DMA_BUFFERS_COUNT,
-    .dma_buf_len = DMA_BUFFER_SIZE,
+    .dma_buf_len = dma_buffer_length,
     .use_apll = this->use_apll_,
     .tx_desc_auto_clear = true,
     .fixed_mclk = I2S_PIN_NO_CHANGE,
@@ -402,7 +447,8 @@ esp_err_t I2SAudioSpeaker::start_i2s_driver_() {
   }
 #endif
 
-  esp_err_t err = i2s_driver_install(this->parent_->get_port(), &config, 0, nullptr);
+  esp_err_t err =
+      i2s_driver_install(this->parent_->get_port(), &config, I2S_EVENT_QUEUE_COUNT, &this->i2s_event_queue_);
   if (err != ESP_OK) {
     // Failed to install the driver, so unlock the I2S port
     this->parent_->unlock();
@@ -456,16 +502,7 @@ esp_err_t I2SAudioSpeaker::reconfigure_i2s_stream_info_(audio::AudioStreamInfo &
 }
 
 void I2SAudioSpeaker::delete_task_(size_t buffer_size) {
-  if (this->audio_ring_buffer_ != nullptr) {
+  this->audio_ring_buffer_.reset();  // Releases onwership of the shared_ptr
-    xEventGroupWaitBits(this->event_group_,
-                        MESSAGE_RING_BUFFER_AVAILABLE_TO_WRITE,  // Bit message to read
-                        pdFALSE,                                 // Don't clear the bits on exit
-                        pdTRUE,                                  // Don't wait for all the bits,
-                        portMAX_DELAY);                          // Block indefinitely until a command bit is set
-
-    this->audio_ring_buffer_.reset();  // Deallocates the ring buffer stored in the unique_ptr
-    this->audio_ring_buffer_ = nullptr;
-  }
 
   if (this->data_buffer_ != nullptr) {
     ExternalRAMAllocator<uint8_t> allocator(ExternalRAMAllocator<uint8_t>::ALLOW_FAILURE);

esphome/components/i2s_audio/speaker/i2s_audio_speaker.h

@@ -7,6 +7,7 @@
 #include <driver/i2s.h>
 
 #include <freertos/event_groups.h>
+#include <freertos/queue.h>
 #include <freertos/FreeRTOS.h>
 
 #include "esphome/components/audio/audio.h"
@@ -22,11 +23,12 @@ namespace i2s_audio {
 
 class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Component {
  public:
-  float get_setup_priority() const override { return esphome::setup_priority::LATE; }
+  float get_setup_priority() const override { return esphome::setup_priority::PROCESSOR; }
 
   void setup() override;
   void loop() override;
 
+  void set_buffer_duration(uint32_t buffer_duration_ms) { this->buffer_duration_ms_ = buffer_duration_ms; }
   void set_timeout(uint32_t ms) { this->timeout_ = ms; }
   void set_dout_pin(uint8_t pin) { this->dout_pin_ = pin; }
 #if SOC_I2S_SUPPORTS_DAC
@@ -49,11 +51,17 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
 
   bool has_buffered_data() const override;
 
-  /// @brief Sets the volume of the speaker. It is implemented as a software volume control.
+  /// @brief Sets the volume of the speaker. Uses the speaker's configured audio dac component. If unavailble, it is
-  /// Overrides the default setter to convert the floating point volume to a Q15 fixed-point factor.
+  /// implemented as a software volume control. Overrides the default setter to convert the floating point volume to a
-  /// @param volume
+  /// Q15 fixed-point factor.
+  /// @param volume between 0.0 and 1.0
   void set_volume(float volume) override;
-  float get_volume() override { return this->volume_; }
+
+  /// @brief Mutes or unmute the speaker. Uses the speaker's configured audio dac component. If unavailble, it is
+  /// implemented as a software volume control. Overrides the default setter to convert the floating point volume to a
+  /// Q15 fixed-point factor.
+  /// @param mute_state true for muting, false for unmuting
+  void set_mute_state(bool mute_state) override;
 
  protected:
   /// @brief Function for the FreeRTOS task handling audio output.
@@ -111,10 +119,14 @@ class I2SAudioSpeaker : public I2SAudioOut, public speaker::Speaker, public Comp
   TaskHandle_t speaker_task_handle_{nullptr};
   EventGroupHandle_t event_group_{nullptr};
 
-  uint8_t *data_buffer_;
+  QueueHandle_t i2s_event_queue_;
-  std::unique_ptr<RingBuffer> audio_ring_buffer_;
 
-  uint32_t timeout_;
+  uint8_t *data_buffer_;
+  std::shared_ptr<RingBuffer> audio_ring_buffer_;
+
+  uint32_t buffer_duration_ms_;
+
+  optional<uint32_t> timeout_;
   uint8_t dout_pin_;
 
   bool task_created_{false};

esphome/components/ili9xxx/display.py

@@ -196,6 +196,10 @@ CONFIG_SCHEMA = cv.All(
     _validate,
 )
 
+FINAL_VALIDATE_SCHEMA = spi.final_validate_device_schema(
+    "ili9xxx", require_miso=False, require_mosi=True
+)
+
 
 async def to_code(config):
     rhs = MODELS[config[CONF_MODEL]].new()

esphome/components/image/__init__.py

@@ -361,24 +361,21 @@ async def to_code(config):
     elif config[CONF_TYPE] in ["RGB565"]:
         image = image.convert("RGBA")
         pixels = list(image.getdata())
-        data = [0 for _ in range(height * width * 2)]
+        bytes_per_pixel = 3 if transparent else 2
+        data = [0 for _ in range(height * width * bytes_per_pixel)]
         pos = 0
         for r, g, b, a in pixels:
             R = r >> 3
             G = g >> 2
             B = b >> 3
             rgb = (R << 11) | (G << 5) | B
-
-            if transparent:
-                if rgb == 0x0020:
-                    rgb = 0
-                if a < 0x80:
-                    rgb = 0x0020
-
             data[pos] = rgb >> 8
             pos += 1
             data[pos] = rgb & 0xFF
             pos += 1
+            if transparent:
+                data[pos] = a
+                pos += 1
 
     elif config[CONF_TYPE] in ["BINARY", "TRANSPARENT_BINARY"]:
         if transparent:

esphome/components/image/image.cpp

@@ -88,7 +88,7 @@ lv_img_dsc_t *Image::get_lv_img_dsc() {
     this->dsc_.header.reserved = 0;
     this->dsc_.header.w = this->width_;
     this->dsc_.header.h = this->height_;
-    this->dsc_.data_size = image_type_to_width_stride(this->dsc_.header.w * this->dsc_.header.h, this->get_type());
+    this->dsc_.data_size = this->get_width_stride() * this->get_height();
     switch (this->get_type()) {
       case IMAGE_TYPE_BINARY:
         this->dsc_.header.cf = LV_IMG_CF_ALPHA_1BIT;
@@ -104,17 +104,17 @@ lv_img_dsc_t *Image::get_lv_img_dsc() {
 
       case IMAGE_TYPE_RGB565:
 #if LV_COLOR_DEPTH == 16
-        this->dsc_.header.cf = this->has_transparency() ? LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED : LV_IMG_CF_TRUE_COLOR;
+        this->dsc_.header.cf = this->has_transparency() ? LV_IMG_CF_TRUE_COLOR_ALPHA : LV_IMG_CF_TRUE_COLOR;
 #else
         this->dsc_.header.cf = LV_IMG_CF_RGB565;
 #endif
         break;
 
-      case image::IMAGE_TYPE_RGBA:
+      case IMAGE_TYPE_RGBA:
 #if LV_COLOR_DEPTH == 32
         this->dsc_.header.cf = LV_IMG_CF_TRUE_COLOR;
 #else
-        this->dsc_.header.cf = LV_IMG_CF_RGBA8888;
+        this->dsc_.header.cf = LV_IMG_CF_TRUE_COLOR_ALPHA;
 #endif
         break;
     }
@@ -147,21 +147,21 @@ Color Image::get_rgb24_pixel_(int x, int y) const {
   return color;
 }
 Color Image::get_rgb565_pixel_(int x, int y) const {
-  const uint32_t pos = (x + y * this->width_) * 2;
+  const uint8_t *pos = this->data_start_;
-  uint16_t rgb565 =
+  if (this->transparent_) {
-      progmem_read_byte(this->data_start_ + pos + 0) << 8 | progmem_read_byte(this->data_start_ + pos + 1);
+    pos += (x + y * this->width_) * 3;
+  } else {
+    pos += (x + y * this->width_) * 2;
+  }
+  uint16_t rgb565 = encode_uint16(progmem_read_byte(pos), progmem_read_byte(pos + 1));
   auto r = (rgb565 & 0xF800) >> 11;
   auto g = (rgb565 & 0x07E0) >> 5;
   auto b = rgb565 & 0x001F;
-  Color color = Color((r << 3) | (r >> 2), (g << 2) | (g >> 4), (b << 3) | (b >> 2));
+  auto a = this->transparent_ ? progmem_read_byte(pos + 2) : 0xFF;
-  if (rgb565 == 0x0020 && transparent_) {
+  Color color = Color((r << 3) | (r >> 2), (g << 2) | (g >> 4), (b << 3) | (b >> 2), a);
-    // darkest green has been defined as transparent color for transparent RGB565 images.
-    color.w = 0;
-  } else {
-    color.w = 0xFF;
-  }
   return color;
 }
+
 Color Image::get_grayscale_pixel_(int x, int y) const {
   const uint32_t pos = (x + y * this->width_);
   const uint8_t gray = progmem_read_byte(this->data_start_ + pos);

esphome/components/image/image.h

@@ -3,12 +3,7 @@
 #include "esphome/components/display/display.h"
 
 #ifdef USE_LVGL
-// required for clang-tidy
+#include "esphome/components/lvgl/lvgl_proxy.h"
-#ifndef LV_CONF_H
-#define LV_CONF_SKIP 1  // NOLINT
-#endif                  // LV_CONF_H
-
-#include <lvgl.h>
 #endif  // USE_LVGL
 
 namespace esphome {
@@ -22,24 +17,6 @@ enum ImageType {
   IMAGE_TYPE_RGBA = 4,
 };
 
-inline int image_type_to_bpp(ImageType type) {
-  switch (type) {
-    case IMAGE_TYPE_BINARY:
-      return 1;
-    case IMAGE_TYPE_GRAYSCALE:
-      return 8;
-    case IMAGE_TYPE_RGB565:
-      return 16;
-    case IMAGE_TYPE_RGB24:
-      return 24;
-    case IMAGE_TYPE_RGBA:
-      return 32;
-  }
-  return 0;
-}
-
-inline int image_type_to_width_stride(int width, ImageType type) { return (width * image_type_to_bpp(type) + 7u) / 8u; }
-
 class Image : public display::BaseImage {
  public:
   Image(const uint8_t *data_start, int width, int height, ImageType type);
@@ -49,6 +26,25 @@ class Image : public display::BaseImage {
   const uint8_t *get_data_start() const { return this->data_start_; }
   ImageType get_type() const;
 
+  int get_bpp() const {
+    switch (this->type_) {
+      case IMAGE_TYPE_BINARY:
+        return 1;
+      case IMAGE_TYPE_GRAYSCALE:
+        return 8;
+      case IMAGE_TYPE_RGB565:
+        return this->transparent_ ? 24 : 16;
+      case IMAGE_TYPE_RGB24:
+        return 24;
+      case IMAGE_TYPE_RGBA:
+        return 32;
+    }
+    return 0;
+  }
+
+  /// Return the stride of the image in bytes, that is, the distance in bytes
+  /// between two consecutive rows of pixels.
+  uint32_t get_width_stride() const { return (this->width_ * this->get_bpp() + 7u) / 8u; }
   void draw(int x, int y, display::Display *display, Color color_on, Color color_off) override;
 
   void set_transparency(bool transparent) { transparent_ = transparent; }

esphome/components/internal_temperature/internal_temperature.cpp

@@ -8,8 +8,13 @@ extern "C" {
 uint8_t temprature_sens_read();
 }
 #elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || \
-    defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32H2) || \
+    defined(USE_ESP32_VARIANT_ESP32C2)
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
 #include "driver/temp_sensor.h"
+#else
+#include "driver/temperature_sensor.h"
+#endif  // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
 #endif  // USE_ESP32_VARIANT
 #endif  // USE_ESP32
 #ifdef USE_RP2040
@@ -25,6 +30,13 @@ namespace esphome {
 namespace internal_temperature {
 
 static const char *const TAG = "internal_temperature";
+#ifdef USE_ESP32
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)) && \
+    (defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S2) || \
+     defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32H2) || defined(USE_ESP32_VARIANT_ESP32C2))
+static temperature_sensor_handle_t tsensNew = NULL;
+#endif  // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) && USE_ESP32_VARIANT
+#endif  // USE_ESP32
 
 void InternalTemperatureSensor::update() {
   float temperature = NAN;
@@ -36,7 +48,9 @@ void InternalTemperatureSensor::update() {
   temperature = (raw - 32) / 1.8f;
   success = (raw != 128);
 #elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || \
-    defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+    defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32H2) || \
+    defined(USE_ESP32_VARIANT_ESP32C2)
+#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
   temp_sensor_config_t tsens = TSENS_CONFIG_DEFAULT();
   temp_sensor_set_config(tsens);
   temp_sensor_start();
@@ -47,6 +61,13 @@ void InternalTemperatureSensor::update() {
   esp_err_t result = temp_sensor_read_celsius(&temperature);
   temp_sensor_stop();
   success = (result == ESP_OK);
+#else
+  esp_err_t result = temperature_sensor_get_celsius(tsensNew, &temperature);
+  success = (result == ESP_OK);
+  if (!success) {
+    ESP_LOGE(TAG, "Failed to get temperature: %d", result);
+  }
+#endif  // ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 0, 0)
 #endif  // USE_ESP32_VARIANT
 #endif  // USE_ESP32
 #ifdef USE_RP2040
@@ -75,6 +96,32 @@ void InternalTemperatureSensor::update() {
   }
 }
 
+void InternalTemperatureSensor::setup() {
+#ifdef USE_ESP32
+#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)) && \
+    (defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S2) || \
+     defined(USE_ESP32_VARIANT_ESP32S3) || defined(USE_ESP32_VARIANT_ESP32H2) || defined(USE_ESP32_VARIANT_ESP32C2))
+  ESP_LOGCONFIG(TAG, "Setting up temperature sensor...");
+
+  temperature_sensor_config_t tsens_config = TEMPERATURE_SENSOR_CONFIG_DEFAULT(-10, 80);
+
+  esp_err_t result = temperature_sensor_install(&tsens_config, &tsensNew);
+  if (result != ESP_OK) {
+    ESP_LOGE(TAG, "Failed to install temperature sensor: %d", result);
+    this->mark_failed();
+    return;
+  }
+
+  result = temperature_sensor_enable(tsensNew);
+  if (result != ESP_OK) {
+    ESP_LOGE(TAG, "Failed to enable temperature sensor: %d", result);
+    this->mark_failed();
+    return;
+  }
+#endif  // ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0) && USE_ESP32_VARIANT
+#endif  // USE_ESP32
+}
+
 void InternalTemperatureSensor::dump_config() { LOG_SENSOR("", "Internal Temperature Sensor", this); }
 
 }  // namespace internal_temperature

esphome/components/internal_temperature/internal_temperature.h

@@ -8,6 +8,7 @@ namespace internal_temperature {
 
 class InternalTemperatureSensor : public sensor::Sensor, public PollingComponent {
  public:
+  void setup() override;
   void dump_config() override;
 
   void update() override;

esphome/components/ld2420/ld2420.cpp

@@ -180,7 +180,7 @@ void LD2420Component::apply_config_action() {
 }
 
 void LD2420Component::factory_reset_action() {
-  ESP_LOGCONFIG(TAG, "Setiing factory defaults...");
+  ESP_LOGCONFIG(TAG, "Setting factory defaults...");
   if (this->set_config_mode(true) == LD2420_ERROR_TIMEOUT) {
     ESP_LOGE(TAG, "LD2420 module has failed to respond, check baud rate and serial connections.");
     this->mark_failed();

esphome/components/libretiny/__init__.py

@@ -46,7 +46,7 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 CODEOWNERS = ["@kuba2k2"]
-AUTO_LOAD = []
+AUTO_LOAD = ["preferences"]
 
 
 def _detect_variant(value):

esphome/components/libretiny/gpio.py

@@ -1,8 +1,8 @@
 import logging
 
+from esphome import pins
 import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome import pins
 from esphome.const import (
     CONF_ANALOG,
     CONF_ID,
@@ -103,8 +103,10 @@ def _translate_pin(value):
             "This variable only supports pin numbers, not full pin schemas "
             "(with inverted and mode)."
         )
-    if isinstance(value, int):
+    if isinstance(value, int) and not isinstance(value, bool):
         return value
+    if not isinstance(value, str):
+        raise cv.Invalid(f"Invalid pin number: {value}")
     try:
         return int(value)
     except ValueError:

esphome/components/lvgl/__init__.py

@@ -7,6 +7,7 @@ import esphome.config_validation as cv
 from esphome.const import (
     CONF_AUTO_CLEAR_ENABLED,
     CONF_BUFFER_SIZE,
+    CONF_GROUP,
     CONF_ID,
     CONF_LAMBDA,
     CONF_ON_IDLE,
@@ -23,17 +24,23 @@ from esphome.helpers import write_file_if_changed
 from . import defines as df, helpers, lv_validation as lvalid
 from .automation import disp_update, focused_widgets, update_to_code
 from .defines import add_define
-from .encoders import ENCODERS_CONFIG, encoders_to_code, initial_focus_to_code
+from .encoders import (
+    ENCODERS_CONFIG,
+    encoders_to_code,
+    get_default_group,
+    initial_focus_to_code,
+)
 from .gradient import GRADIENT_SCHEMA, gradients_to_code
 from .hello_world import get_hello_world
+from .keypads import KEYPADS_CONFIG, keypads_to_code
 from .lv_validation import lv_bool, lv_images_used
-from .lvcode import LvContext, LvglComponent
+from .lvcode import LvContext, LvglComponent, lvgl_static
 from .schemas import (
     DISP_BG_SCHEMA,
     FLEX_OBJ_SCHEMA,
     GRID_CELL_SCHEMA,
     LAYOUT_SCHEMAS,
-    STATE_SCHEMA,
+    STYLE_SCHEMA,
     WIDGET_TYPES,
     any_widget_schema,
     container_schema,
@@ -71,6 +78,7 @@ from .widgets.meter import meter_spec
 from .widgets.msgbox import MSGBOX_SCHEMA, msgboxes_to_code
 from .widgets.obj import obj_spec
 from .widgets.page import add_pages, generate_page_triggers, page_spec
+from .widgets.qrcode import qr_code_spec
 from .widgets.roller import roller_spec
 from .widgets.slider import slider_spec
 from .widgets.spinbox import spinbox_spec
@@ -109,6 +117,7 @@ for w_type in (
     spinbox_spec,
     keyboard_spec,
     tileview_spec,
+    qr_code_spec,
 ):
     WIDGET_TYPES[w_type.name] = w_type
 
@@ -150,41 +159,78 @@ def generate_lv_conf_h():
     return LV_CONF_H_FORMAT.format("\n".join(definitions))
 
 
-def final_validation(config):
+def multi_conf_validate(configs: list[dict]):
-    if pages := config.get(CONF_PAGES):
+    displays = [config[df.CONF_DISPLAYS] for config in configs]
-        if all(p[df.CONF_SKIP] for p in pages):
+    # flatten the display list
-            raise cv.Invalid("At least one page must not be skipped")
+    display_list = [disp for disps in displays for disp in disps]
+    if len(display_list) != len(set(display_list)):
+        raise cv.Invalid("A display ID may be used in only one LVGL instance")
+    for config in configs:
+        for item in (df.CONF_ENCODERS, df.CONF_KEYPADS):
+            for enc in config.get(item, ()):
+                if CONF_GROUP not in enc:
+                    raise cv.Invalid(
+                        f"'{item}' must have an explicit group set when using multiple LVGL instances"
+                    )
+    base_config = configs[0]
+    for config in configs[1:]:
+        for item in (
+            df.CONF_LOG_LEVEL,
+            df.CONF_COLOR_DEPTH,
+            df.CONF_BYTE_ORDER,
+            df.CONF_TRANSPARENCY_KEY,
+        ):
+            if base_config[item] != config[item]:
+                raise cv.Invalid(
+                    f"Config item '{item}' must be the same for all LVGL instances"
+                )
+
+
+def final_validation(configs):
+    if len(configs) != 1:
+        multi_conf_validate(configs)
     global_config = full_config.get()
-    for display_id in config[df.CONF_DISPLAYS]:
+    for config in configs:
-        path = global_config.get_path_for_id(display_id)[:-1]
+        if pages := config.get(CONF_PAGES):
-        display = global_config.get_config_for_path(path)
+            if all(p[df.CONF_SKIP] for p in pages):
-        if CONF_LAMBDA in display:
+                raise cv.Invalid("At least one page must not be skipped")
-            raise cv.Invalid("Using lambda: in display config not compatible with LVGL")
+        for display_id in config[df.CONF_DISPLAYS]:
-        if display[CONF_AUTO_CLEAR_ENABLED]:
+            path = global_config.get_path_for_id(display_id)[:-1]
-            raise cv.Invalid(
+            display = global_config.get_config_for_path(path)
-                "Using auto_clear_enabled: true in display config not compatible with LVGL"
+            if CONF_LAMBDA in display:
-            )
+                raise cv.Invalid(
-    buffer_frac = config[CONF_BUFFER_SIZE]
+                    "Using lambda: in display config not compatible with LVGL"
-    if CORE.is_esp32 and buffer_frac > 0.5 and "psram" not in global_config:
+                )
-        LOGGER.warning("buffer_size: may need to be reduced without PSRAM")
+            if display[CONF_AUTO_CLEAR_ENABLED]:
-    for image_id in lv_images_used:
+                raise cv.Invalid(
-        path = global_config.get_path_for_id(image_id)[:-1]
+                    "Using auto_clear_enabled: true in display config not compatible with LVGL"
-        image_conf = global_config.get_config_for_path(path)
+                )
-        if image_conf[CONF_TYPE] in ("RGBA", "RGB24"):
+        buffer_frac = config[CONF_BUFFER_SIZE]
-            raise cv.Invalid(
+        if CORE.is_esp32 and buffer_frac > 0.5 and "psram" not in global_config:
-                "Using RGBA or RGB24 in image config not compatible with LVGL", path
+            LOGGER.warning("buffer_size: may need to be reduced without PSRAM")
-            )
+        for image_id in lv_images_used:
-    for w in focused_widgets:
+            path = global_config.get_path_for_id(image_id)[:-1]
-        path = global_config.get_path_for_id(w)
+            image_conf = global_config.get_config_for_path(path)
-        widget_conf = global_config.get_config_for_path(path[:-1])
+            if image_conf[CONF_TYPE] in ("RGBA", "RGB24"):
-        if df.CONF_ADJUSTABLE in widget_conf and not widget_conf[df.CONF_ADJUSTABLE]:
+                raise cv.Invalid(
-            raise cv.Invalid(
+                    "Using RGBA or RGB24 in image config not compatible with LVGL", path
-                "A non adjustable arc may not be focused",
+                )
-                path,
+        for w in focused_widgets:
-            )
+            path = global_config.get_path_for_id(w)
+            widget_conf = global_config.get_config_for_path(path[:-1])
+            if (
+                df.CONF_ADJUSTABLE in widget_conf
+                and not widget_conf[df.CONF_ADJUSTABLE]
+            ):
+                raise cv.Invalid(
+                    "A non adjustable arc may not be focused",
+                    path,
+                )
 
 
-async def to_code(config):
+async def to_code(configs):
+    config_0 = configs[0]
+    # Global configuration
     cg.add_library("lvgl/lvgl", "8.4.0")
     cg.add_define("USE_LVGL")
     # suppress default enabling of extra widgets
@@ -201,53 +247,33 @@ async def to_code(config):
     add_define("LV_MEM_CUSTOM_INCLUDE", '"esphome/components/lvgl/lvgl_hal.h"')
 
     add_define(
-        "LV_LOG_LEVEL", f"LV_LOG_LEVEL_{df.LV_LOG_LEVELS[config[df.CONF_LOG_LEVEL]]}"
+        "LV_LOG_LEVEL",
+        f"LV_LOG_LEVEL_{df.LV_LOG_LEVELS[config_0[df.CONF_LOG_LEVEL]]}",
     )
     cg.add_define(
         "LVGL_LOG_LEVEL",
-        cg.RawExpression(f"ESPHOME_LOG_LEVEL_{config[df.CONF_LOG_LEVEL]}"),
+        cg.RawExpression(f"ESPHOME_LOG_LEVEL_{config_0[df.CONF_LOG_LEVEL]}"),
     )
-    add_define("LV_COLOR_DEPTH", config[df.CONF_COLOR_DEPTH])
+    add_define("LV_COLOR_DEPTH", config_0[df.CONF_COLOR_DEPTH])
     for font in helpers.lv_fonts_used:
         add_define(f"LV_FONT_{font.upper()}")
 
-    if config[df.CONF_COLOR_DEPTH] == 16:
+    if config_0[df.CONF_COLOR_DEPTH] == 16:
         add_define(
             "LV_COLOR_16_SWAP",
-            "1" if config[df.CONF_BYTE_ORDER] == "big_endian" else "0",
+            "1" if config_0[df.CONF_BYTE_ORDER] == "big_endian" else "0",
         )
     add_define(
         "LV_COLOR_CHROMA_KEY",
-        await lvalid.lv_color.process(config[df.CONF_TRANSPARENCY_KEY]),
+        await lvalid.lv_color.process(config_0[df.CONF_TRANSPARENCY_KEY]),
     )
     cg.add_build_flag("-Isrc")
 
     cg.add_global(lvgl_ns.using)
-    frac = config[CONF_BUFFER_SIZE]
-    if frac >= 0.75:
-        frac = 1
-    elif frac >= 0.375:
-        frac = 2
-    elif frac > 0.19:
-        frac = 4
-    else:
-        frac = 8
-    displays = [await cg.get_variable(display) for display in config[df.CONF_DISPLAYS]]
-    lv_component = cg.new_Pvariable(
-        config[CONF_ID],
-        displays,
-        frac,
-        config[df.CONF_FULL_REFRESH],
-        config[df.CONF_DRAW_ROUNDING],
-        config[df.CONF_RESUME_ON_INPUT],
-    )
-    await cg.register_component(lv_component, config)
-    Widget.create(config[CONF_ID], lv_component, obj_spec, config)
-
     for font in helpers.esphome_fonts_used:
         await cg.get_variable(font)
         cg.new_Pvariable(ID(f"{font}_engine", True, type=FontEngine), MockObj(font))
-    default_font = config[df.CONF_DEFAULT_FONT]
+    default_font = config_0[df.CONF_DEFAULT_FONT]
     if not lvalid.is_lv_font(default_font):
         add_define(
             "LV_FONT_CUSTOM_DECLARE", f"LV_FONT_DECLARE(*{df.DEFAULT_ESPHOME_FONT})"
@@ -263,39 +289,73 @@ async def to_code(config):
         add_define("LV_FONT_DEFAULT", df.DEFAULT_ESPHOME_FONT)
     else:
         add_define("LV_FONT_DEFAULT", await lvalid.lv_font.process(default_font))
+    cg.add(lvgl_static.esphome_lvgl_init())
+    default_group = get_default_group(config_0)
 
-    lv_scr_act = get_scr_act(lv_component)
+    for config in configs:
-    async with LvContext(lv_component):
+        frac = config[CONF_BUFFER_SIZE]
-        await touchscreens_to_code(lv_component, config)
+        if frac >= 0.75:
-        await encoders_to_code(lv_component, config)
+            frac = 1
-        await theme_to_code(config)
+        elif frac >= 0.375:
-        await styles_to_code(config)
+            frac = 2
-        await gradients_to_code(config)
+        elif frac > 0.19:
-        await set_obj_properties(lv_scr_act, config)
+            frac = 4
-        await add_widgets(lv_scr_act, config)
+        else:
-        await add_pages(lv_component, config)
+            frac = 8
-        await add_top_layer(lv_component, config)
+        displays = [
-        await msgboxes_to_code(lv_component, config)
+            await cg.get_variable(display) for display in config[df.CONF_DISPLAYS]
-        await disp_update(lv_component.get_disp(), config)
+        ]
+        lv_component = cg.new_Pvariable(
+            config[CONF_ID],
+            displays,
+            frac,
+            config[df.CONF_FULL_REFRESH],
+            config[df.CONF_DRAW_ROUNDING],
+            config[df.CONF_RESUME_ON_INPUT],
+        )
+        await cg.register_component(lv_component, config)
+        Widget.create(config[CONF_ID], lv_component, obj_spec, config)
+
+        lv_scr_act = get_scr_act(lv_component)
+        async with LvContext():
+            await touchscreens_to_code(lv_component, config)
+            await encoders_to_code(lv_component, config, default_group)
+            await keypads_to_code(lv_component, config, default_group)
+            await theme_to_code(config)
+            await styles_to_code(config)
+            await gradients_to_code(config)
+            await set_obj_properties(lv_scr_act, config)
+            await add_widgets(lv_scr_act, config)
+            await add_pages(lv_component, config)
+            await add_top_layer(lv_component, config)
+            await msgboxes_to_code(lv_component, config)
+            await disp_update(lv_component.get_disp(), config)
     # Set this directly since we are limited in how many methods can be added to the Widget class.
     Widget.widgets_completed = True
-    async with LvContext(lv_component):
+    async with LvContext():
-        await generate_triggers(lv_component)
+        await generate_triggers()
-        await generate_page_triggers(lv_component, config)
+        for config in configs:
-        await initial_focus_to_code(config)
+            lv_component = await cg.get_variable(config[CONF_ID])
-        for conf in config.get(CONF_ON_IDLE, ()):
+            await generate_page_triggers(config)
-            templ = await cg.templatable(conf[CONF_TIMEOUT], [], cg.uint32)
+            await initial_focus_to_code(config)
-            idle_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, templ)
+            for conf in config.get(CONF_ON_IDLE, ()):
-            await build_automation(idle_trigger, [], conf)
+                templ = await cg.templatable(conf[CONF_TIMEOUT], [], cg.uint32)
-        for conf in config.get(df.CONF_ON_PAUSE, ()):
+                idle_trigger = cg.new_Pvariable(
-            pause_trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], lv_component, True)
+                    conf[CONF_TRIGGER_ID], lv_component, templ
-            await build_automation(pause_trigger, [], conf)
+                )
-        for conf in config.get(df.CONF_ON_RESUME, ()):
+                await build_automation(idle_trigger, [], conf)
-            resume_trigger = cg.new_Pvariable(
+            for conf in config.get(df.CONF_ON_PAUSE, ()):
-                conf[CONF_TRIGGER_ID], lv_component, False
+                pause_trigger = cg.new_Pvariable(
-            )
+                    conf[CONF_TRIGGER_ID], lv_component, True
-            await build_automation(resume_trigger, [], conf)
+                )
+                await build_automation(pause_trigger, [], conf)
+            for conf in config.get(df.CONF_ON_RESUME, ()):
+                resume_trigger = cg.new_Pvariable(
+                    conf[CONF_TRIGGER_ID], lv_component, False
+                )
+                await build_automation(resume_trigger, [], conf)
 
+    # This must be done after all widgets are created
     for comp in helpers.lvgl_components_required:
         cg.add_define(f"USE_LVGL_{comp.upper()}")
     if "transform_angle" in styles_used:
@@ -310,7 +370,10 @@ async def to_code(config):
 
 def display_schema(config):
     value = cv.ensure_list(cv.use_id(Display))(config)
-    return value or [cv.use_id(Display)(config)]
+    value = value or [cv.use_id(Display)(config)]
+    if len(set(value)) != len(value):
+        raise cv.Invalid("Display IDs must be unique")
+    return value
 
 
 def add_hello_world(config):
@@ -322,7 +385,7 @@ def add_hello_world(config):
 
 FINAL_VALIDATE_SCHEMA = final_validation
 
-CONFIG_SCHEMA = (
+LVGL_SCHEMA = (
     cv.polling_component_schema("1s")
     .extend(obj_schema(obj_spec))
     .extend(
@@ -342,7 +405,7 @@ CONFIG_SCHEMA = (
             ),
             cv.Optional(df.CONF_STYLE_DEFINITIONS): cv.ensure_list(
                 cv.Schema({cv.Required(CONF_ID): cv.declare_id(lv_style_t)})
-                .extend(STATE_SCHEMA)
+                .extend(STYLE_SCHEMA)
                 .extend(
                     {
                         cv.Optional(df.CONF_GRID_CELL_X_ALIGN): grid_alignments,
@@ -384,6 +447,7 @@ CONFIG_SCHEMA = (
             cv.Optional(df.CONF_GRADIENTS): GRADIENT_SCHEMA,
             cv.Optional(df.CONF_TOUCHSCREENS, default=None): touchscreen_schema,
             cv.Optional(df.CONF_ENCODERS, default=None): ENCODERS_CONFIG,
+            cv.Optional(df.CONF_KEYPADS, default=None): KEYPADS_CONFIG,
             cv.GenerateID(df.CONF_DEFAULT_GROUP): cv.declare_id(lv_group_t),
             cv.Optional(df.CONF_RESUME_ON_INPUT, default=True): cv.boolean,
         }
@@ -391,3 +455,16 @@ CONFIG_SCHEMA = (
     .extend(DISP_BG_SCHEMA)
     .add_extra(add_hello_world)
 )
+
+
+def lvgl_config_schema(config):
+    """
+    Can't use cv.ensure_list here because it converts an empty config to an empty list,
+    rather than a default config.
+    """
+    if not config or isinstance(config, dict):
+        return [LVGL_SCHEMA(config)]
+    return cv.Schema([LVGL_SCHEMA])(config)
+
+
+CONFIG_SCHEMA = lvgl_config_schema

esphome/components/lvgl/automation.py

@@ -1,5 +1,4 @@
-from collections.abc import Awaitable
+from typing import Any, Callable
-from typing import Callable
 
 from esphome import automation
 import esphome.codegen as cg
@@ -23,7 +22,6 @@ from .lvcode import (
     UPDATE_EVENT,
     LambdaContext,
     LocalVariable,
-    LvglComponent,
     ReturnStatement,
     add_line_marks,
     lv,
@@ -58,7 +56,7 @@ focused_widgets = set()
 
 async def action_to_code(
     widgets: list[Widget],
-    action: Callable[[Widget], Awaitable[None]],
+    action: Callable[[Widget], Any],
     action_id,
     template_arg,
     args,
@@ -137,20 +135,18 @@ async def disp_update(disp, config: dict):
         cv.maybe_simple_value(
             {
                 cv.Required(CONF_ID): cv.use_id(lv_obj_t),
-                cv.GenerateID(CONF_LVGL_ID): cv.use_id(LvglComponent),
             },
             key=CONF_ID,
         ),
-        cv.Schema(
+        LVGL_SCHEMA,
-            {
-                cv.GenerateID(CONF_LVGL_ID): cv.use_id(LvglComponent),
-            }
-        ),
     ),
 )
 async def obj_invalidate_to_code(config, action_id, template_arg, args):
-    lv_comp = await cg.get_variable(config[CONF_LVGL_ID])
+    if CONF_LVGL_ID in config:
-    widgets = await get_widgets(config) or [get_scr_act(lv_comp)]
+        lv_comp = await cg.get_variable(config[CONF_LVGL_ID])
+        widgets = [get_scr_act(lv_comp)]
+    else:
+        widgets = await get_widgets(config)
 
     async def do_invalidate(widget: Widget):
         lv_obj.invalidate(widget.obj)
@@ -161,14 +157,12 @@ async def obj_invalidate_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "lvgl.update",
     LvglAction,
-    DISP_BG_SCHEMA.extend(
+    DISP_BG_SCHEMA.extend(LVGL_SCHEMA).add_extra(
-        {
+        cv.has_at_least_one_key(CONF_DISP_BG_COLOR, CONF_DISP_BG_IMAGE)
-            cv.GenerateID(): cv.use_id(LvglComponent),
+    ),
-        }
-    ).add_extra(cv.has_at_least_one_key(CONF_DISP_BG_COLOR, CONF_DISP_BG_IMAGE)),
 )
 async def lvgl_update_to_code(config, action_id, template_arg, args):
-    widgets = await get_widgets(config)
+    widgets = await get_widgets(config, CONF_LVGL_ID)
     w = widgets[0]
     disp = literal(f"{w.obj}->get_disp()")
     async with LambdaContext(LVGL_COMP_ARG, where=action_id) as context:
@@ -181,32 +175,33 @@ async def lvgl_update_to_code(config, action_id, template_arg, args):
 @automation.register_action(
     "lvgl.pause",
     LvglAction,
-    {
+    LVGL_SCHEMA.extend(
-        cv.GenerateID(): cv.use_id(LvglComponent),
+        {
-        cv.Optional(CONF_SHOW_SNOW, default=False): lv_bool,
+            cv.Optional(CONF_SHOW_SNOW, default=False): lv_bool,
-    },
+        }
+    ),
 )
 async def pause_action_to_code(config, action_id, template_arg, args):
+    lv_comp = await cg.get_variable(config[CONF_LVGL_ID])
     async with LambdaContext(LVGL_COMP_ARG) as context:
         add_line_marks(where=action_id)
         lv_add(lvgl_comp.set_paused(True, config[CONF_SHOW_SNOW]))
     var = cg.new_Pvariable(action_id, template_arg, await context.get_lambda())
-    await cg.register_parented(var, config[CONF_ID])
+    await cg.register_parented(var, lv_comp)
     return var
 
 
 @automation.register_action(
     "lvgl.resume",
     LvglAction,
-    {
+    LVGL_SCHEMA,
-        cv.GenerateID(): cv.use_id(LvglComponent),
-    },
 )
 async def resume_action_to_code(config, action_id, template_arg, args):
+    lv_comp = await cg.get_variable(config[CONF_LVGL_ID])
     async with LambdaContext(LVGL_COMP_ARG, where=action_id) as context:
         lv_add(lvgl_comp.set_paused(False, False))
     var = cg.new_Pvariable(action_id, template_arg, await context.get_lambda())
-    await cg.register_parented(var, config[CONF_ID])
+    await cg.register_parented(var, lv_comp)
     return var
 
 
@@ -265,14 +260,15 @@ def focused_id(value):
     ObjUpdateAction,
     cv.Any(
         cv.maybe_simple_value(
-            {
+            LVGL_SCHEMA.extend(
-                cv.Optional(CONF_GROUP): cv.use_id(lv_group_t),
+                {
-                cv.Required(CONF_ACTION): cv.one_of(
+                    cv.Optional(CONF_GROUP): cv.use_id(lv_group_t),
-                    "MARK", "RESTORE", "NEXT", "PREVIOUS", upper=True
+                    cv.Required(CONF_ACTION): cv.one_of(
-                ),
+                        "MARK", "RESTORE", "NEXT", "PREVIOUS", upper=True
-                cv.GenerateID(CONF_LVGL_ID): cv.use_id(LvglComponent),
+                    ),
-                cv.Optional(CONF_FREEZE, default=False): cv.boolean,
+                    cv.Optional(CONF_FREEZE, default=False): cv.boolean,
-            },
+                }
+            ),
             key=CONF_ACTION,
         ),
         cv.maybe_simple_value(

esphome/components/lvgl/binary_sensor/__init__.py

@@ -1,4 +1,3 @@
-import esphome.codegen as cg
 from esphome.components.binary_sensor import (
     BinarySensor,
     binary_sensor_schema,
@@ -6,36 +5,30 @@ from esphome.components.binary_sensor import (
 )
 import esphome.config_validation as cv
 
-from ..defines import CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_WIDGET
-from ..lvcode import EVENT_ARG, LambdaContext, LvContext
+from ..lvcode import EVENT_ARG, LambdaContext, LvContext, lvgl_static
-from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, lv_pseudo_button_t
 from ..widgets import Widget, get_widgets, wait_for_widgets
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = binary_sensor_schema(BinarySensor).extend(
-    binary_sensor_schema(BinarySensor)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(lv_pseudo_button_t),
-    .extend(
+    }
-        {
-            cv.Required(CONF_WIDGET): cv.use_id(lv_pseudo_button_t),
-        }
-    )
 )
 
 
 async def to_code(config):
     sensor = await new_binary_sensor(config)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     assert isinstance(widget, Widget)
     await wait_for_widgets()
     async with LambdaContext(EVENT_ARG) as pressed_ctx:
         pressed_ctx.add(sensor.publish_state(widget.is_pressed()))
-    async with LvContext(paren) as ctx:
+    async with LvContext() as ctx:
         ctx.add(sensor.publish_initial_state(widget.is_pressed()))
         ctx.add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj,
                 await pressed_ctx.get_lambda(),
                 LV_EVENT.PRESSING,

esphome/components/lvgl/defines.py

@@ -438,6 +438,7 @@ CONF_HEADER_MODE = "header_mode"
 CONF_HOME = "home"
 CONF_INITIAL_FOCUS = "initial_focus"
 CONF_KEY_CODE = "key_code"
+CONF_KEYPADS = "keypads"
 CONF_LAYOUT = "layout"
 CONF_LEFT_BUTTON = "left_button"
 CONF_LINE_WIDTH = "line_width"

esphome/components/lvgl/encoders.py

@@ -17,7 +17,7 @@ from .defines import (
 from .helpers import lvgl_components_required, requires_component
 from .lvcode import lv, lv_add, lv_assign, lv_expr, lv_Pvariable
 from .schemas import ENCODER_SCHEMA
-from .types import lv_group_t, lv_indev_type_t
+from .types import lv_group_t, lv_indev_type_t, lv_key_t
 
 ENCODERS_CONFIG = cv.ensure_list(
     ENCODER_SCHEMA.extend(
@@ -39,10 +39,13 @@ ENCODERS_CONFIG = cv.ensure_list(
 )
 
 
-async def encoders_to_code(var, config):
+def get_default_group(config):
-    default_group = lv_Pvariable(lv_group_t, config[CONF_DEFAULT_GROUP])
+    default_group = cg.Pvariable(config[CONF_DEFAULT_GROUP], lv_expr.group_create())
-    lv_assign(default_group, lv_expr.group_create())
+    cg.add(lv.group_set_default(default_group))
-    lv.group_set_default(default_group)
+    return default_group
+
+
+async def encoders_to_code(var, config, default_group):
     for enc_conf in config[CONF_ENCODERS]:
         lvgl_components_required.add("KEY_LISTENER")
         lpt = enc_conf[CONF_LONG_PRESS_TIME].total_milliseconds
@@ -54,14 +57,14 @@ async def encoders_to_code(var, config):
         if sensor_config := enc_conf.get(CONF_SENSOR):
             if isinstance(sensor_config, dict):
                 b_sensor = await cg.get_variable(sensor_config[CONF_LEFT_BUTTON])
-                cg.add(listener.set_left_button(b_sensor))
+                cg.add(listener.add_button(b_sensor, lv_key_t.LV_KEY_LEFT))
                 b_sensor = await cg.get_variable(sensor_config[CONF_RIGHT_BUTTON])
-                cg.add(listener.set_right_button(b_sensor))
+                cg.add(listener.add_button(b_sensor, lv_key_t.LV_KEY_RIGHT))
             else:
                 sensor_config = await cg.get_variable(sensor_config)
                 lv_add(listener.set_sensor(sensor_config))
         b_sensor = await cg.get_variable(enc_conf[CONF_ENTER_BUTTON])
-        cg.add(listener.set_enter_button(b_sensor))
+        cg.add(listener.add_button(b_sensor, lv_key_t.LV_KEY_ENTER))
         if group := enc_conf.get(CONF_GROUP):
             group = lv_Pvariable(lv_group_t, group)
             lv_assign(group, lv_expr.group_create())

esphome/components/lvgl/keypads.py

@@ -0,0 +1,77 @@
+import esphome.codegen as cg
+from esphome.components.binary_sensor import BinarySensor
+import esphome.config_validation as cv
+from esphome.const import CONF_GROUP, CONF_ID
+
+from .defines import (
+    CONF_ENCODERS,
+    CONF_INITIAL_FOCUS,
+    CONF_KEYPADS,
+    CONF_LONG_PRESS_REPEAT_TIME,
+    CONF_LONG_PRESS_TIME,
+    literal,
+)
+from .helpers import lvgl_components_required
+from .lvcode import lv, lv_assign, lv_expr, lv_Pvariable
+from .schemas import ENCODER_SCHEMA
+from .types import lv_group_t, lv_indev_type_t
+
+KEYPAD_KEYS = (
+    "up",
+    "down",
+    "right",
+    "left",
+    "esc",
+    "del",
+    "backspace",
+    "enter",
+    "next",
+    "prev",
+    "home",
+    "end",
+    "0",
+    "1",
+    "2",
+    "3",
+    "4",
+    "5",
+    "6",
+    "7",
+    "8",
+    "9",
+    "#",
+    "*",
+)
+
+KEYPADS_CONFIG = cv.ensure_list(
+    ENCODER_SCHEMA.extend(
+        {cv.Optional(key): cv.use_id(BinarySensor) for key in KEYPAD_KEYS}
+    )
+)
+
+
+async def keypads_to_code(var, config, default_group):
+    for enc_conf in config[CONF_KEYPADS]:
+        lvgl_components_required.add("KEY_LISTENER")
+        lpt = enc_conf[CONF_LONG_PRESS_TIME].total_milliseconds
+        lprt = enc_conf[CONF_LONG_PRESS_REPEAT_TIME].total_milliseconds
+        listener = cg.new_Pvariable(
+            enc_conf[CONF_ID], lv_indev_type_t.LV_INDEV_TYPE_KEYPAD, lpt, lprt
+        )
+        await cg.register_parented(listener, var)
+        for key in [x for x in enc_conf if x in KEYPAD_KEYS]:
+            b_sensor = await cg.get_variable(enc_conf[key])
+            cg.add(listener.add_button(b_sensor, literal(f"LV_KEY_{key.upper()}")))
+        if group := enc_conf.get(CONF_GROUP):
+            group = lv_Pvariable(lv_group_t, group)
+            lv_assign(group, lv_expr.group_create())
+        else:
+            group = default_group
+        lv.indev_set_group(lv_expr.indev_drv_register(listener.get_drv()), group)
+
+
+async def initial_focus_to_code(config):
+    for enc_conf in config[CONF_ENCODERS]:
+        if default_focus := enc_conf.get(CONF_INITIAL_FOCUS):
+            obj = await cg.get_variable(default_focus)
+            lv.group_focus_obj(obj)

esphome/components/lvgl/light/__init__.py

@@ -2,11 +2,10 @@ import esphome.codegen as cg
 from esphome.components import light
 from esphome.components.light import LightOutput
 import esphome.config_validation as cv
-from esphome.const import CONF_GAMMA_CORRECT, CONF_LED, CONF_OUTPUT_ID
+from esphome.const import CONF_GAMMA_CORRECT, CONF_OUTPUT_ID
 
-from ..defines import CONF_LVGL_ID
+from ..defines import CONF_WIDGET
 from ..lvcode import LvContext
-from ..schemas import LVGL_SCHEMA
 from ..types import LvType, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
@@ -15,19 +14,18 @@ LVLight = lvgl_ns.class_("LVLight", LightOutput)
 CONFIG_SCHEMA = light.RGB_LIGHT_SCHEMA.extend(
     {
         cv.Optional(CONF_GAMMA_CORRECT, default=0.0): cv.positive_float,
-        cv.Required(CONF_LED): cv.use_id(lv_led_t),
+        cv.Required(CONF_WIDGET): cv.use_id(lv_led_t),
         cv.GenerateID(CONF_OUTPUT_ID): cv.declare_id(LVLight),
     }
-).extend(LVGL_SCHEMA)
+)
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_OUTPUT_ID])
     await light.register_light(var, config)
 
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
+    widget = await get_widgets(config, CONF_WIDGET)
-    widget = await get_widgets(config, CONF_LED)
     widget = widget[0]
     await wait_for_widgets()
-    async with LvContext(paren) as ctx:
+    async with LvContext() as ctx:
         ctx.add(var.set_obj(widget.obj))

esphome/components/lvgl/lv_validation.py

@@ -267,6 +267,9 @@ def angle(value):
     return int(cv.float_range(0.0, 360.0)(cv.angle(value)) * 10)
 
 
+lv_angle = LValidator(angle, uint32)
+
+
 @schema_extractor("one_of")
 def size_validator(value):
     """A size in one axis - one of "size_content", a number (pixels) or a percentage"""
@@ -274,10 +277,8 @@ def size_validator(value):
         return ["SIZE_CONTENT", "number of pixels", "percentage"]
     if isinstance(value, str) and value.lower().endswith("px"):
         value = cv.int_(value[:-2])
-    if isinstance(value, str) and not value.endswith("%"):
+    if isinstance(value, str) and value.upper() == "SIZE_CONTENT":
-        if value.upper() == "SIZE_CONTENT":
+        return "LV_SIZE_CONTENT"
-            return "LV_SIZE_CONTENT"
-        raise cv.Invalid("must be 'size_content', a percentage or an integer (pixels)")
     return pixels_or_percent_validator(value)
 
 
@@ -403,6 +404,7 @@ class TextValidator(LValidator):
 lv_text = TextValidator()
 lv_float = LValidator(cv.float_, cg.float_)
 lv_int = LValidator(cv.int_, cg.int_)
+lv_positive_int = LValidator(cv.positive_int, cg.int_)
 lv_brightness = LValidator(cv.percentage, cg.float_, retmapper=lambda x: int(x * 255))
 
 

esphome/components/lvgl/lvcode.py

@@ -178,10 +178,9 @@ class LvContext(LambdaContext):
 
     added_lambda_count = 0
 
-    def __init__(self, lv_component, args=None):
+    def __init__(self, args=None):
         self.args = args or LVGL_COMP_ARG
         super().__init__(parameters=self.args)
-        self.lv_component = lv_component
 
     async def __aexit__(self, exc_type, exc_val, exc_tb):
         await super().__aexit__(exc_type, exc_val, exc_tb)
@@ -298,6 +297,7 @@ lv_expr = LvExpr("lv_")
 lv_obj = MockLv("lv_obj_")
 # Operations on the LVGL component
 lvgl_comp = MockObj(LVGL_COMP, "->")
+lvgl_static = MockObj("LvglComponent", "::")
 
 
 # equivalent to cg.add() for the current code context

esphome/components/lvgl/lvgl_esphome.cpp

@@ -84,6 +84,7 @@ lv_event_code_t lv_api_event;     // NOLINT
 lv_event_code_t lv_update_event;  // NOLINT
 void LvglComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "LVGL:");
+  ESP_LOGCONFIG(TAG, "  Display width/height: %d x %d", this->disp_drv_.hor_res, this->disp_drv_.ver_res);
   ESP_LOGCONFIG(TAG, "  Rotation: %d", this->rotation);
   ESP_LOGCONFIG(TAG, "  Draw rounding: %d", (int) this->draw_rounding);
 }
@@ -97,19 +98,24 @@ void LvglComponent::set_paused(bool paused, bool show_snow) {
   this->pause_callbacks_.call(paused);
 }
 
+void LvglComponent::esphome_lvgl_init() {
+  lv_init();
+  lv_update_event = static_cast<lv_event_code_t>(lv_event_register_id());
+  lv_api_event = static_cast<lv_event_code_t>(lv_event_register_id());
+}
 void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event) {
-  lv_obj_add_event_cb(obj, callback, event, this);
+  lv_obj_add_event_cb(obj, callback, event, nullptr);
 }
 void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1,
                                  lv_event_code_t event2) {
-  this->add_event_cb(obj, callback, event1);
+  add_event_cb(obj, callback, event1);
-  this->add_event_cb(obj, callback, event2);
+  add_event_cb(obj, callback, event2);
 }
 void LvglComponent::add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1,
                                  lv_event_code_t event2, lv_event_code_t event3) {
-  this->add_event_cb(obj, callback, event1);
+  add_event_cb(obj, callback, event1);
-  this->add_event_cb(obj, callback, event2);
+  add_event_cb(obj, callback, event2);
-  this->add_event_cb(obj, callback, event3);
+  add_event_cb(obj, callback, event3);
 }
 void LvglComponent::add_page(LvPageType *page) {
   this->pages_.push_back(page);
@@ -145,7 +151,7 @@ void LvglComponent::draw_buffer_(const lv_area_t *area, lv_color_t *ptr) {
   lv_color_t *dst = this->rotate_buf_;
   switch (this->rotation) {
     case display::DISPLAY_ROTATION_90_DEGREES:
-      for (lv_coord_t x = height - 1; x-- != 0;) {
+      for (lv_coord_t x = height; x-- != 0;) {
         for (lv_coord_t y = 0; y != width; y++) {
           dst[y * height + x] = *ptr++;
         }
@@ -217,8 +223,10 @@ PauseTrigger::PauseTrigger(LvglComponent *parent, TemplatableValue<bool> paused)
 }
 
 #ifdef USE_LVGL_TOUCHSCREEN
-LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time) {
+LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time, LvglComponent *parent) {
+  this->set_parent(parent);
   lv_indev_drv_init(&this->drv_);
+  this->drv_.disp = parent->get_disp();
   this->drv_.long_press_repeat_time = long_press_repeat_time;
   this->drv_.long_press_time = long_press_time;
   this->drv_.type = LV_INDEV_TYPE_POINTER;
@@ -234,6 +242,7 @@ LVTouchListener::LVTouchListener(uint16_t long_press_time, uint16_t long_press_r
     }
   };
 }
+
 void LVTouchListener::update(const touchscreen::TouchPoints_t &tpoints) {
   this->touch_pressed_ = !this->parent_->is_paused() && !tpoints.empty();
   if (this->touch_pressed_)
@@ -404,9 +413,6 @@ LvglComponent::LvglComponent(std::vector<display::Display *> displays, float buf
       buffer_frac_(buffer_frac),
       full_refresh_(full_refresh),
       resume_on_input_(resume_on_input) {
-  lv_init();
-  lv_update_event = static_cast<lv_event_code_t>(lv_event_register_id());
-  lv_api_event = static_cast<lv_event_code_t>(lv_event_register_id());
   auto *display = this->displays_[0];
   size_t buffer_pixels = display->get_width() * display->get_height() / this->buffer_frac_;
   auto buf_bytes = buffer_pixels * LV_COLOR_DEPTH / 8;
@@ -426,19 +432,8 @@ LvglComponent::LvglComponent(std::vector<display::Display *> displays, float buf
   this->disp_drv_.full_refresh = this->full_refresh_;
   this->disp_drv_.flush_cb = static_flush_cb;
   this->disp_drv_.rounder_cb = rounder_cb;
-  // reset the display rotation since we will handle all rotations
+  this->disp_drv_.hor_res = (lv_coord_t) display->get_width();
-  display->set_rotation(display::DISPLAY_ROTATION_0_DEGREES);
+  this->disp_drv_.ver_res = (lv_coord_t) display->get_height();
-  switch (this->rotation) {
-    default:
-      this->disp_drv_.hor_res = (lv_coord_t) display->get_width();
-      this->disp_drv_.ver_res = (lv_coord_t) display->get_height();
-      break;
-    case display::DISPLAY_ROTATION_90_DEGREES:
-    case display::DISPLAY_ROTATION_270_DEGREES:
-      this->disp_drv_.ver_res = (lv_coord_t) display->get_width();
-      this->disp_drv_.hor_res = (lv_coord_t) display->get_height();
-      break;
-  }
   this->disp_ = lv_disp_drv_register(&this->disp_drv_);
 }
 
@@ -459,6 +454,9 @@ void LvglComponent::setup() {
     esp_log_printf_(LVGL_LOG_LEVEL, TAG, 0, "%.*s", (int) strlen(buf) - 1, buf);
   });
 #endif
+  // Rotation will be handled by our drawing function, so reset the display rotation.
+  for (auto *display : this->displays_)
+    display->set_rotation(display::DISPLAY_ROTATION_0_DEGREES);
   this->show_page(0, LV_SCR_LOAD_ANIM_NONE, 0);
   lv_disp_trig_activity(this->disp_);
   ESP_LOGCONFIG(TAG, "LVGL Setup complete");

esphome/components/lvgl/lvgl_esphome.h

@@ -146,10 +146,14 @@ class LvglComponent : public PollingComponent {
     }
   }
 
-  void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event);
+  /**
-  void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2);
+   * Initialize the LVGL library and register custom events.
-  void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2,
+   */
-                    lv_event_code_t event3);
+  static void esphome_lvgl_init();
+  static void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event);
+  static void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2);
+  static void add_event_cb(lv_obj_t *obj, event_callback_t callback, lv_event_code_t event1, lv_event_code_t event2,
+                           lv_event_code_t event3);
   void add_page(LvPageType *page);
   void show_page(size_t index, lv_scr_load_anim_t anim, uint32_t time);
   void show_next_page(lv_scr_load_anim_t anim, uint32_t time);
@@ -231,7 +235,7 @@ template<typename... Ts> class LvglCondition : public Condition<Ts...>, public P
 #ifdef USE_LVGL_TOUCHSCREEN
 class LVTouchListener : public touchscreen::TouchListener, public Parented<LvglComponent> {
  public:
-  LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time);
+  LVTouchListener(uint16_t long_press_time, uint16_t long_press_repeat_time, LvglComponent *parent);
   void update(const touchscreen::TouchPoints_t &tpoints) override;
   void release() override {
     touch_pressed_ = false;
@@ -252,15 +256,8 @@ class LVEncoderListener : public Parented<LvglComponent> {
   LVEncoderListener(lv_indev_type_t type, uint16_t lpt, uint16_t lprt);
 
 #ifdef USE_BINARY_SENSOR
-  void set_left_button(binary_sensor::BinarySensor *left_button) {
+  void add_button(binary_sensor::BinarySensor *button, lv_key_t key) {
-    left_button->add_on_state_callback([this](bool state) { this->event(LV_KEY_LEFT, state); });
+    button->add_on_state_callback([this, key](bool state) { this->event(key, state); });
-  }
-  void set_right_button(binary_sensor::BinarySensor *right_button) {
-    right_button->add_on_state_callback([this](bool state) { this->event(LV_KEY_RIGHT, state); });
-  }
-
-  void set_enter_button(binary_sensor::BinarySensor *enter_button) {
-    enter_button->add_on_state_callback([this](bool state) { this->event(LV_KEY_ENTER, state); });
   }
 #endif
 

esphome/components/lvgl/lvgl_proxy.h

@@ -0,0 +1,17 @@
+#pragma once
+/**
+* This header is for use in components that might or might not use LVGL. There is a platformio bug where
+the mere mention of a header file, even if ifdefed, causes the build to fail. This is a workaround, since if this
+file is included in the build, LVGL is always included.
+*/
+#ifdef USE_LVGL
+// required for clang-tidy
+#ifndef LV_CONF_H
+#define LV_CONF_SKIP 1  // NOLINT
+#endif                  // LV_CONF_H
+
+#include <lvgl.h>
+namespace esphome {
+namespace lvgl {}  // namespace lvgl
+}  // namespace esphome
+#endif  // USE_LVGL

esphome/components/lvgl/number/__init__.py

@@ -3,7 +3,7 @@ from esphome.components import number
 import esphome.config_validation as cv
 from esphome.cpp_generator import MockObj
 
-from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_UPDATE_ON_RELEASE, CONF_WIDGET
+from ..defines import CONF_ANIMATED, CONF_UPDATE_ON_RELEASE, CONF_WIDGET
 from ..lv_validation import animated
 from ..lvcode import (
     API_EVENT,
@@ -13,28 +13,23 @@ from ..lvcode import (
     LvContext,
     lv,
     lv_add,
+    lvgl_static,
 )
-from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvNumber, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
 LVGLNumber = lvgl_ns.class_("LVGLNumber", number.Number)
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = number.number_schema(LVGLNumber).extend(
-    number.number_schema(LVGLNumber)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(LvNumber),
-    .extend(
+        cv.Optional(CONF_ANIMATED, default=True): animated,
-        {
+        cv.Optional(CONF_UPDATE_ON_RELEASE, default=False): cv.boolean,
-            cv.Required(CONF_WIDGET): cv.use_id(LvNumber),
+    }
-            cv.Optional(CONF_ANIMATED, default=True): animated,
-            cv.Optional(CONF_UPDATE_ON_RELEASE, default=False): cv.boolean,
-        }
-    )
 )
 
 
 async def to_code(config):
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     var = await number.new_number(
@@ -58,10 +53,10 @@ async def to_code(config):
         if not config[CONF_UPDATE_ON_RELEASE]
         else LV_EVENT.RELEASED
     )
-    async with LvContext(paren):
+    async with LvContext():
         lv_add(var.set_control_lambda(await control.get_lambda()))
         lv_add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj, await event.get_lambda(), UPDATE_EVENT, event_code
             )
         )

esphome/components/lvgl/schemas.py

@@ -91,7 +91,7 @@ STYLE_PROPS = {
     "arc_opa": lvalid.opacity,
     "arc_color": lvalid.lv_color,
     "arc_rounded": lvalid.lv_bool,
-    "arc_width": cv.positive_int,
+    "arc_width": lvalid.lv_positive_int,
     "anim_time": lvalid.lv_milliseconds,
     "bg_color": lvalid.lv_color,
     "bg_grad": lv_gradient,
@@ -111,7 +111,7 @@ STYLE_PROPS = {
     "border_side": df.LvConstant(
         "LV_BORDER_SIDE_", "NONE", "TOP", "BOTTOM", "LEFT", "RIGHT", "INTERNAL"
     ).several_of,
-    "border_width": cv.positive_int,
+    "border_width": lvalid.lv_positive_int,
     "clip_corner": lvalid.lv_bool,
     "color_filter_opa": lvalid.opacity,
     "height": lvalid.size,
@@ -134,11 +134,11 @@ STYLE_PROPS = {
     "pad_right": lvalid.pixels,
     "pad_top": lvalid.pixels,
     "shadow_color": lvalid.lv_color,
-    "shadow_ofs_x": cv.int_,
+    "shadow_ofs_x": lvalid.lv_int,
-    "shadow_ofs_y": cv.int_,
+    "shadow_ofs_y": lvalid.lv_int,
     "shadow_opa": lvalid.opacity,
-    "shadow_spread": cv.int_,
+    "shadow_spread": lvalid.lv_int,
-    "shadow_width": cv.positive_int,
+    "shadow_width": lvalid.lv_positive_int,
     "text_align": df.LvConstant(
         "LV_TEXT_ALIGN_", "LEFT", "CENTER", "RIGHT", "AUTO"
     ).one_of,
@@ -150,7 +150,7 @@ STYLE_PROPS = {
     "text_letter_space": cv.positive_int,
     "text_line_space": cv.positive_int,
     "text_opa": lvalid.opacity,
-    "transform_angle": lvalid.angle,
+    "transform_angle": lvalid.lv_angle,
     "transform_height": lvalid.pixels_or_percent,
     "transform_pivot_x": lvalid.pixels_or_percent,
     "transform_pivot_y": lvalid.pixels_or_percent,
@@ -391,7 +391,9 @@ def container_validator(schema, widget_type: WidgetType):
             add_lv_use(ltype)
         if value == SCHEMA_EXTRACT:
             return result
-        result = result.extend(LAYOUT_SCHEMAS[ltype.lower()])
+        result = result.extend(
+            LAYOUT_SCHEMAS.get(ltype.lower(), LAYOUT_SCHEMAS[df.TYPE_NONE])
+        )
         return result(value)
 
     return validator

esphome/components/lvgl/select/__init__.py

@@ -1,25 +1,19 @@
-import esphome.codegen as cg
 from esphome.components import select
 import esphome.config_validation as cv
 from esphome.const import CONF_OPTIONS
 
-from ..defines import CONF_ANIMATED, CONF_LVGL_ID, CONF_WIDGET, literal
+from ..defines import CONF_ANIMATED, CONF_WIDGET, literal
 from ..lvcode import LvContext
-from ..schemas import LVGL_SCHEMA
 from ..types import LvSelect, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
 LVGLSelect = lvgl_ns.class_("LVGLSelect", select.Select)
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = select.select_schema(LVGLSelect).extend(
-    select.select_schema(LVGLSelect)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(LvSelect),
-    .extend(
+        cv.Optional(CONF_ANIMATED, default=False): cv.boolean,
-        {
+    }
-            cv.Required(CONF_WIDGET): cv.use_id(LvSelect),
-            cv.Optional(CONF_ANIMATED, default=False): cv.boolean,
-        }
-    )
 )
 
 
@@ -28,9 +22,8 @@ async def to_code(config):
     widget = widget[0]
     options = widget.config.get(CONF_OPTIONS, [])
     selector = await select.new_select(config, options=options)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     await wait_for_widgets()
-    async with LvContext(paren) as ctx:
+    async with LvContext() as ctx:
         ctx.add(
             selector.set_widget(
                 widget.var,

esphome/components/lvgl/sensor/__init__.py

@@ -1,8 +1,7 @@
-import esphome.codegen as cg
 from esphome.components.sensor import Sensor, new_sensor, sensor_schema
 import esphome.config_validation as cv
 
-from ..defines import CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_WIDGET
 from ..lvcode import (
     API_EVENT,
     EVENT_ARG,
@@ -11,34 +10,29 @@ from ..lvcode import (
     LambdaContext,
     LvContext,
     lv_add,
+    lvgl_static,
 )
-from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvNumber
 from ..widgets import Widget, get_widgets, wait_for_widgets
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = sensor_schema(Sensor).extend(
-    sensor_schema(Sensor)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(LvNumber),
-    .extend(
+    }
-        {
-            cv.Required(CONF_WIDGET): cv.use_id(LvNumber),
-        }
-    )
 )
 
 
 async def to_code(config):
     sensor = await new_sensor(config)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     assert isinstance(widget, Widget)
     await wait_for_widgets()
     async with LambdaContext(EVENT_ARG) as lamb:
         lv_add(sensor.publish_state(widget.get_value()))
-    async with LvContext(paren, LVGL_COMP_ARG):
+    async with LvContext(LVGL_COMP_ARG):
         lv_add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj,
                 await lamb.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,

esphome/components/lvgl/switch/__init__.py

@@ -3,7 +3,7 @@ from esphome.components.switch import Switch, new_switch, switch_schema
 import esphome.config_validation as cv
 from esphome.cpp_generator import MockObj
 
-from ..defines import CONF_LVGL_ID, CONF_WIDGET, literal
+from ..defines import CONF_WIDGET, literal
 from ..lvcode import (
     API_EVENT,
     EVENT_ARG,
@@ -13,26 +13,21 @@ from ..lvcode import (
     LvContext,
     lv,
     lv_add,
+    lvgl_static,
 )
-from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LV_STATE, lv_pseudo_button_t, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
 LVGLSwitch = lvgl_ns.class_("LVGLSwitch", Switch)
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = switch_schema(LVGLSwitch).extend(
-    switch_schema(LVGLSwitch)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(lv_pseudo_button_t),
-    .extend(
+    }
-        {
-            cv.Required(CONF_WIDGET): cv.use_id(lv_pseudo_button_t),
-        }
-    )
 )
 
 
 async def to_code(config):
     switch = await new_switch(config)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     await wait_for_widgets()
@@ -45,10 +40,10 @@ async def to_code(config):
             widget.clear_state(LV_STATE.CHECKED)
         lv.event_send(widget.obj, API_EVENT, cg.nullptr)
         control.add(switch.publish_state(literal("v")))
-    async with LvContext(paren) as ctx:
+    async with LvContext() as ctx:
         lv_add(switch.set_control_lambda(await control.get_lambda()))
         ctx.add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj,
                 await checked_ctx.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,

esphome/components/lvgl/text/__init__.py

@@ -3,7 +3,7 @@ from esphome.components import text
 from esphome.components.text import new_text
 import esphome.config_validation as cv
 
-from ..defines import CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_WIDGET
 from ..lvcode import (
     API_EVENT,
     EVENT_ARG,
@@ -12,14 +12,14 @@ from ..lvcode import (
     LvContext,
     lv,
     lv_add,
+    lvgl_static,
 )
-from ..schemas import LVGL_SCHEMA
 from ..types import LV_EVENT, LvText, lvgl_ns
 from ..widgets import get_widgets, wait_for_widgets
 
 LVGLText = lvgl_ns.class_("LVGLText", text.Text)
 
-CONFIG_SCHEMA = text.TEXT_SCHEMA.extend(LVGL_SCHEMA).extend(
+CONFIG_SCHEMA = text.TEXT_SCHEMA.extend(
     {
         cv.GenerateID(): cv.declare_id(LVGLText),
         cv.Required(CONF_WIDGET): cv.use_id(LvText),
@@ -29,7 +29,6 @@ CONFIG_SCHEMA = text.TEXT_SCHEMA.extend(LVGL_SCHEMA).extend(
 
 async def to_code(config):
     textvar = await new_text(config)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     await wait_for_widgets()
@@ -39,10 +38,10 @@ async def to_code(config):
         control.add(textvar.publish_state(widget.get_value()))
     async with LambdaContext(EVENT_ARG) as lamb:
         lv_add(textvar.publish_state(widget.get_value()))
-    async with LvContext(paren):
+    async with LvContext():
         lv_add(textvar.set_control_lambda(await control.get_lambda()))
         lv_add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj,
                 await lamb.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,

esphome/components/lvgl/text_sensor/__init__.py

@@ -1,4 +1,3 @@
-import esphome.codegen as cg
 from esphome.components.text_sensor import (
     TextSensor,
     new_text_sensor,
@@ -6,34 +5,35 @@ from esphome.components.text_sensor import (
 )
 import esphome.config_validation as cv
 
-from ..defines import CONF_LVGL_ID, CONF_WIDGET
+from ..defines import CONF_WIDGET
-from ..lvcode import API_EVENT, EVENT_ARG, UPDATE_EVENT, LambdaContext, LvContext
+from ..lvcode import (
-from ..schemas import LVGL_SCHEMA
+    API_EVENT,
+    EVENT_ARG,
+    UPDATE_EVENT,
+    LambdaContext,
+    LvContext,
+    lvgl_static,
+)
 from ..types import LV_EVENT, LvText
 from ..widgets import get_widgets, wait_for_widgets
 
-CONFIG_SCHEMA = (
+CONFIG_SCHEMA = text_sensor_schema(TextSensor).extend(
-    text_sensor_schema(TextSensor)
+    {
-    .extend(LVGL_SCHEMA)
+        cv.Required(CONF_WIDGET): cv.use_id(LvText),
-    .extend(
+    }
-        {
-            cv.Required(CONF_WIDGET): cv.use_id(LvText),
-        }
-    )
 )
 
 
 async def to_code(config):
     sensor = await new_text_sensor(config)
-    paren = await cg.get_variable(config[CONF_LVGL_ID])
     widget = await get_widgets(config, CONF_WIDGET)
     widget = widget[0]
     await wait_for_widgets()
     async with LambdaContext(EVENT_ARG) as pressed_ctx:
         pressed_ctx.add(sensor.publish_state(widget.get_value()))
-    async with LvContext(paren) as ctx:
+    async with LvContext() as ctx:
         ctx.add(
-            paren.add_event_cb(
+            lvgl_static.add_event_cb(
                 widget.obj,
                 await pressed_ctx.get_lambda(),
                 LV_EVENT.VALUE_CHANGED,

esphome/components/lvgl/touchscreens.py

@@ -33,13 +33,12 @@ def touchscreen_schema(config):
     return [TOUCHSCREENS_CONFIG(config)]
 
 
-async def touchscreens_to_code(var, config):
+async def touchscreens_to_code(lv_component, config):
     for tconf in config[CONF_TOUCHSCREENS]:
         lvgl_components_required.add(CONF_TOUCHSCREEN)
         touchscreen = await cg.get_variable(tconf[CONF_TOUCHSCREEN_ID])
         lpt = tconf[CONF_LONG_PRESS_TIME].total_milliseconds
         lprt = tconf[CONF_LONG_PRESS_REPEAT_TIME].total_milliseconds
-        listener = cg.new_Pvariable(tconf[CONF_ID], lpt, lprt)
+        listener = cg.new_Pvariable(tconf[CONF_ID], lpt, lprt, lv_component)
-        await cg.register_parented(listener, var)
         lv.indev_drv_register(listener.get_drv())
         cg.add(touchscreen.register_listener(listener))

esphome/components/lvgl/trigger.py

@@ -20,17 +20,16 @@ from .lvcode import (
     lv,
     lv_add,
     lv_event_t_ptr,
+    lvgl_static,
 )
 from .types import LV_EVENT
 from .widgets import widget_map
 
 
-async def generate_triggers(lv_component):
+async def generate_triggers():
     """
     Generate LVGL triggers for all defined widgets
     Must be done after all widgets completed
-    :param lv_component:  The parent component
-    :return:
     """
 
     for w in widget_map.values():
@@ -43,11 +42,10 @@ async def generate_triggers(lv_component):
                 conf = conf[0]
                 w.add_flag("LV_OBJ_FLAG_CLICKABLE")
                 event = literal("LV_EVENT_" + LV_EVENT_MAP[event[3:].upper()])
-                await add_trigger(conf, lv_component, w, event)
+                await add_trigger(conf, w, event)
             for conf in w.config.get(CONF_ON_VALUE, ()):
                 await add_trigger(
                     conf,
-                    lv_component,
                     w,
                     LV_EVENT.VALUE_CHANGED,
                     API_EVENT,
@@ -63,7 +61,7 @@ async def generate_triggers(lv_component):
                 lv.obj_align_to(w.obj, target, align, x, y)
 
 
-async def add_trigger(conf, lv_component, w, *events):
+async def add_trigger(conf, w, *events):
     tid = conf[CONF_TRIGGER_ID]
     trigger = cg.new_Pvariable(tid)
     args = w.get_args() + [(lv_event_t_ptr, "event")]
@@ -72,4 +70,4 @@ async def add_trigger(conf, lv_component, w, *events):
     async with LambdaContext(EVENT_ARG, where=tid) as context:
         with LvConditional(w.is_selected()):
             lv_add(trigger.trigger(*value, literal("event")))
-    lv_add(lv_component.add_event_cb(w.obj, await context.get_lambda(), *events))
+    lv_add(lvgl_static.add_event_cb(w.obj, await context.get_lambda(), *events))

esphome/components/lvgl/types.py

@@ -40,6 +40,7 @@ void_ptr = cg.void.operator("ptr")
 lv_coord_t = cg.global_ns.namespace("lv_coord_t")
 lv_event_code_t = cg.global_ns.enum("lv_event_code_t")
 lv_indev_type_t = cg.global_ns.enum("lv_indev_type_t")
+lv_key_t = cg.global_ns.enum("lv_key_t")
 FontEngine = lvgl_ns.class_("FontEngine")
 IdleTrigger = lvgl_ns.class_("IdleTrigger", automation.Trigger.template())
 PauseTrigger = lvgl_ns.class_("PauseTrigger", automation.Trigger.template())

esphome/components/lvgl/widgets/animimg.py

@@ -60,9 +60,10 @@ class AnimimgType(WidgetType):
         lvgl_components_required.add(CONF_IMAGE)
         lvgl_components_required.add(CONF_ANIMIMG)
         if CONF_SRC in config:
-            for x in config[CONF_SRC]:
+            srcs = [
-                await cg.get_variable(x)
+                await lv_image.process(await cg.get_variable(x))
-            srcs = [await lv_image.process(x) for x in config[CONF_SRC]]
+                for x in config[CONF_SRC]
+            ]
             src_id = cg.static_const_array(config[CONF_SRC_LIST_ID], srcs)
             count = len(config[CONF_SRC])
             lv.animimg_set_src(w.obj, src_id, count)

esphome/components/lvgl/widgets/img.py

@@ -1,3 +1,4 @@
+import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.const import CONF_ANGLE, CONF_MODE
 
@@ -64,6 +65,7 @@ class ImgType(WidgetType):
 
     async def to_code(self, w: Widget, config):
         if src := config.get(CONF_SRC):
+            src = await cg.get_variable(src)
             lv.img_set_src(w.obj, await lv_image.process(src))
         if (cf_angle := config.get(CONF_ANGLE)) is not None:
             pivot_x = config[CONF_PIVOT_X]

esphome/components/lvgl/widgets/page.py

@@ -20,6 +20,7 @@ from ..lvcode import (
     add_line_marks,
     lv_add,
     lvgl_comp,
+    lvgl_static,
 )
 from ..schemas import LVGL_SCHEMA
 from ..types import LvglAction, lv_page_t
@@ -139,7 +140,7 @@ async def add_pages(lv_component, config):
         await add_widgets(page, pconf)
 
 
-async def generate_page_triggers(lv_component, config):
+async def generate_page_triggers(config):
     for pconf in config.get(CONF_PAGES, ()):
         page = (await get_widgets(pconf))[0]
         for ev in (CONF_ON_LOAD, CONF_ON_UNLOAD):
@@ -149,7 +150,7 @@ async def generate_page_triggers(lv_component, config):
                 async with LambdaContext(EVENT_ARG, where=id) as context:
                     lv_add(trigger.trigger())
                 lv_add(
-                    lv_component.add_event_cb(
+                    lvgl_static.add_event_cb(
                         page.obj,
                         await context.get_lambda(),
                         literal(f"LV_EVENT_SCREEN_{ev[3:].upper()}_START"),

esphome/components/lvgl/widgets/qrcode.py

@@ -0,0 +1,54 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.const import CONF_SIZE, CONF_TEXT
+from esphome.cpp_generator import MockObjClass
+
+from ..defines import CONF_MAIN, literal
+from ..lv_validation import color, color_retmapper, lv_text
+from ..lvcode import LocalVariable, lv, lv_expr
+from ..schemas import TEXT_SCHEMA
+from ..types import WidgetType, lv_obj_t
+from . import Widget
+
+CONF_QRCODE = "qrcode"
+CONF_DARK_COLOR = "dark_color"
+CONF_LIGHT_COLOR = "light_color"
+
+QRCODE_SCHEMA = TEXT_SCHEMA.extend(
+    {
+        cv.Optional(CONF_DARK_COLOR, default="black"): color,
+        cv.Optional(CONF_LIGHT_COLOR, default="white"): color,
+        cv.Required(CONF_SIZE): cv.int_,
+    }
+)
+
+
+class QrCodeType(WidgetType):
+    def __init__(self):
+        super().__init__(
+            CONF_QRCODE,
+            lv_obj_t,
+            (CONF_MAIN,),
+            QRCODE_SCHEMA,
+            modify_schema=TEXT_SCHEMA,
+        )
+
+    def get_uses(self):
+        return ("canvas", "img")
+
+    def obj_creator(self, parent: MockObjClass, config: dict):
+        dark_color = color_retmapper(config[CONF_DARK_COLOR])
+        light_color = color_retmapper(config[CONF_LIGHT_COLOR])
+        size = config[CONF_SIZE]
+        return lv_expr.call("qrcode_create", parent, size, dark_color, light_color)
+
+    async def to_code(self, w: Widget, config):
+        if (value := config.get(CONF_TEXT)) is not None:
+            value = await lv_text.process(value)
+            with LocalVariable(
+                "qr_text", cg.const_char_ptr, value, modifier=""
+            ) as str_obj:
+                lv.qrcode_update(w.obj, str_obj, literal(f"strlen({str_obj})"))
+
+
+qr_code_spec = QrCodeType()

esphome/components/media_player/__init__.py

@@ -21,6 +21,7 @@ media_player_ns = cg.esphome_ns.namespace("media_player")
 
 MediaPlayer = media_player_ns.class_("MediaPlayer")
 
+
 PlayAction = media_player_ns.class_(
     "PlayAction", automation.Action, cg.Parented.template(MediaPlayer)
 )
@@ -60,7 +61,11 @@ AnnoucementTrigger = media_player_ns.class_(
     "AnnouncementTrigger", automation.Trigger.template()
 )
 IsIdleCondition = media_player_ns.class_("IsIdleCondition", automation.Condition)
+IsPausedCondition = media_player_ns.class_("IsPausedCondition", automation.Condition)
 IsPlayingCondition = media_player_ns.class_("IsPlayingCondition", automation.Condition)
+IsAnnouncingCondition = media_player_ns.class_(
+    "IsAnnouncingCondition", automation.Condition
+)
 
 
 async def setup_media_player_core_(var, config):
@@ -159,9 +164,15 @@ async def media_player_play_media_action(config, action_id, template_arg, args):
 @automation.register_condition(
     "media_player.is_idle", IsIdleCondition, MEDIA_PLAYER_ACTION_SCHEMA
 )
+@automation.register_condition(
+    "media_player.is_paused", IsPausedCondition, MEDIA_PLAYER_ACTION_SCHEMA
+)
 @automation.register_condition(
     "media_player.is_playing", IsPlayingCondition, MEDIA_PLAYER_ACTION_SCHEMA
 )
+@automation.register_condition(
+    "media_player.is_announcing", IsAnnouncingCondition, MEDIA_PLAYER_ACTION_SCHEMA
+)
 async def media_player_action(config, action_id, template_arg, args):
     var = cg.new_Pvariable(action_id, template_arg)
     await cg.register_parented(var, config[CONF_ID])

esphome/components/media_player/automation.h

@@ -68,5 +68,15 @@ template<typename... Ts> class IsPlayingCondition : public Condition<Ts...>, pub
   bool check(Ts... x) override { return this->parent_->state == MediaPlayerState::MEDIA_PLAYER_STATE_PLAYING; }
 };
 
+template<typename... Ts> class IsPausedCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
+ public:
+  bool check(Ts... x) override { return this->parent_->state == MediaPlayerState::MEDIA_PLAYER_STATE_PAUSED; }
+};
+
+template<typename... Ts> class IsAnnouncingCondition : public Condition<Ts...>, public Parented<MediaPlayer> {
+ public:
+  bool check(Ts... x) override { return this->parent_->state == MediaPlayerState::MEDIA_PLAYER_STATE_ANNOUNCING; }
+};
+
 }  // namespace media_player
 }  // namespace esphome

esphome/components/media_player/media_player.cpp

@@ -37,6 +37,10 @@ const char *media_player_command_to_string(MediaPlayerCommand command) {
       return "UNMUTE";
     case MEDIA_PLAYER_COMMAND_TOGGLE:
       return "TOGGLE";
+    case MEDIA_PLAYER_COMMAND_VOLUME_UP:
+      return "VOLUME_UP";
+    case MEDIA_PLAYER_COMMAND_VOLUME_DOWN:
+      return "VOLUME_DOWN";
     default:
       return "UNKNOWN";
   }

esphome/components/midea/air_conditioner.cpp

@@ -3,6 +3,8 @@
 #include "esphome/core/log.h"
 #include "air_conditioner.h"
 #include "ac_adapter.h"
+#include <cmath>
+#include <cstdint>
 
 namespace esphome {
 namespace midea {
@@ -121,7 +123,21 @@ void AirConditioner::dump_config() {
 
 void AirConditioner::do_follow_me(float temperature, bool beeper) {
 #ifdef USE_REMOTE_TRANSMITTER
-  IrFollowMeData data(static_cast<uint8_t>(lroundf(temperature)), beeper);
+  // Check if temperature is finite (not NaN or infinite)
+  if (!std::isfinite(temperature)) {
+    ESP_LOGW(Constants::TAG, "Follow me action requires a finite temperature, got: %f", temperature);
+    return;
+  }
+
+  // Round and convert temperature to long, then clamp and convert it to uint8_t
+  uint8_t temp_uint8 =
+      static_cast<uint8_t>(std::max(0L, std::min(static_cast<long>(UINT8_MAX), std::lroundf(temperature))));
+
+  ESP_LOGD(Constants::TAG, "Follow me action called with temperature: %f °C, rounded to: %u °C", temperature,
+           temp_uint8);
+
+  // Create and transmit the data
+  IrFollowMeData data(temp_uint8, beeper);
   this->transmitter_.transmit(data);
 #else
   ESP_LOGW(Constants::TAG, "Action needs remote_transmitter component");

esphome/components/modbus/modbus.cpp

@@ -15,23 +15,33 @@ void Modbus::setup() {
 void Modbus::loop() {
   const uint32_t now = millis();
 
-  if (now - this->last_modbus_byte_ > 50) {
-    this->rx_buffer_.clear();
-    this->last_modbus_byte_ = now;
-  }
-  // stop blocking new send commands after send_wait_time_ ms regardless if a response has been received since then
-  if (now - this->last_send_ > send_wait_time_) {
-    waiting_for_response = 0;
-  }
-
   while (this->available()) {
     uint8_t byte;
     this->read_byte(&byte);
     if (this->parse_modbus_byte_(byte)) {
       this->last_modbus_byte_ = now;
     } else {
+      size_t at = this->rx_buffer_.size();
+      if (at > 0) {
+        ESP_LOGV(TAG, "Clearing buffer of %d bytes - parse failed", at);
+        this->rx_buffer_.clear();
+      }
+    }
+  }
+
+  if (now - this->last_modbus_byte_ > 50) {
+    size_t at = this->rx_buffer_.size();
+    if (at > 0) {
+      ESP_LOGV(TAG, "Clearing buffer of %d bytes - timeout", at);
       this->rx_buffer_.clear();
     }
+
+    // stop blocking new send commands after sent_wait_time_ ms after response received
+    if (now - this->last_send_ > send_wait_time_) {
+      if (waiting_for_response > 0)
+        ESP_LOGV(TAG, "Stop waiting for response from %d", waiting_for_response);
+      waiting_for_response = 0;
+    }
   }
 }
 
@@ -39,7 +49,7 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
   size_t at = this->rx_buffer_.size();
   this->rx_buffer_.push_back(byte);
   const uint8_t *raw = &this->rx_buffer_[0];
-  ESP_LOGV(TAG, "Modbus received Byte  %d (0X%x)", byte, byte);
+  ESP_LOGVV(TAG, "Modbus received Byte  %d (0X%x)", byte, byte);
   // Byte 0: modbus address (match all)
   if (at == 0)
     return true;
@@ -144,8 +154,10 @@ bool Modbus::parse_modbus_byte_(uint8_t byte) {
     ESP_LOGW(TAG, "Got Modbus frame from unknown address 0x%02X! ", address);
   }
 
-  // return false to reset buffer
+  // reset buffer
-  return false;
+  ESP_LOGV(TAG, "Clearing buffer of %d bytes - parse succeeded", at);
+  this->rx_buffer_.clear();
+  return true;
 }
 
 void Modbus::dump_config() {

esphome/components/modbus_controller/__init__.py

@@ -25,6 +25,8 @@ from .const import (
     CONF_MODBUS_CONTROLLER_ID,
     CONF_OFFLINE_SKIP_UPDATES,
     CONF_ON_COMMAND_SENT,
+    CONF_ON_ONLINE,
+    CONF_ON_OFFLINE,
     CONF_REGISTER_COUNT,
     CONF_REGISTER_TYPE,
     CONF_RESPONSE_SIZE,
@@ -114,6 +116,14 @@ ModbusCommandSentTrigger = modbus_controller_ns.class_(
     "ModbusCommandSentTrigger", automation.Trigger.template(cg.int_, cg.int_)
 )
 
+ModbusOnlineTrigger = modbus_controller_ns.class_(
+    "ModbusOnlineTrigger", automation.Trigger.template(cg.int_, cg.int_)
+)
+
+ModbusOfflineTrigger = modbus_controller_ns.class_(
+    "ModbusOfflineTrigger", automation.Trigger.template(cg.int_, cg.int_)
+)
+
 _LOGGER = logging.getLogger(__name__)
 
 ModbusServerRegisterSchema = cv.Schema(
@@ -146,6 +156,16 @@ CONFIG_SCHEMA = cv.All(
                     ),
                 }
             ),
+            cv.Optional(CONF_ON_ONLINE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ModbusOnlineTrigger),
+                }
+            ),
+            cv.Optional(CONF_ON_OFFLINE): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(ModbusOnlineTrigger),
+                }
+            ),
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -284,7 +304,17 @@ async def to_code(config):
     for conf in config.get(CONF_ON_COMMAND_SENT, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
         await automation.build_automation(
-            trigger, [(int, "function_code"), (int, "address")], conf
+            trigger, [(cg.int_, "function_code"), (cg.int_, "address")], conf
+        )
+    for conf in config.get(CONF_ON_ONLINE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(
+            trigger, [(cg.int_, "function_code"), (cg.int_, "address")], conf
+        )
+    for conf in config.get(CONF_ON_OFFLINE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(
+            trigger, [(cg.int_, "function_code"), (cg.int_, "address")], conf
         )
 
 

esphome/components/modbus_controller/automation.h

@@ -15,5 +15,21 @@ class ModbusCommandSentTrigger : public Trigger<int, int> {
   }
 };
 
+class ModbusOnlineTrigger : public Trigger<int, int> {
+ public:
+  ModbusOnlineTrigger(ModbusController *a_modbuscontroller) {
+    a_modbuscontroller->add_on_online_callback(
+        [this](int function_code, int address) { this->trigger(function_code, address); });
+  }
+};
+
+class ModbusOfflineTrigger : public Trigger<int, int> {
+ public:
+  ModbusOfflineTrigger(ModbusController *a_modbuscontroller) {
+    a_modbuscontroller->add_on_offline_callback(
+        [this](int function_code, int address) { this->trigger(function_code, address); });
+  }
+};
+
 }  // namespace modbus_controller
 }  // namespace esphome

esphome/components/modbus_controller/const.py

@@ -9,6 +9,8 @@ CONF_MAX_CMD_RETRIES = "max_cmd_retries"
 CONF_MODBUS_CONTROLLER_ID = "modbus_controller_id"
 CONF_MODBUS_FUNCTIONCODE = "modbus_functioncode"
 CONF_ON_COMMAND_SENT = "on_command_sent"
+CONF_ON_ONLINE = "on_online"
+CONF_ON_OFFLINE = "on_offline"
 CONF_RAW_ENCODE = "raw_encode"
 CONF_REGISTER_COUNT = "register_count"
 CONF_REGISTER_TYPE = "register_type"

esphome/components/modbus_controller/modbus_controller.cpp

@@ -32,8 +32,10 @@ bool ModbusController::send_next_command_() {
             r.skip_updates_counter = this->offline_skip_updates_;
           }
         }
+
+        this->module_offline_ = true;
+        this->offline_callback_.call((int) command->function_code, command->register_address);
       }
-      this->module_offline_ = true;
       ESP_LOGD(TAG, "Modbus command to device=%d register=0x%02X no response received - removed from send queue",
                this->address_, command->register_address);
       this->command_queue_.pop_front();
@@ -68,8 +70,10 @@ void ModbusController::on_modbus_data(const std::vector<uint8_t> &data) {
           r.skip_updates_counter = 0;
         }
       }
+      // Restore module online state
+      this->module_offline_ = false;
+      this->online_callback_.call((int) current_command->function_code, current_command->register_address);
     }
-    this->module_offline_ = false;
 
     // Move the commandItem to the response queue
     current_command->payload = data;
@@ -670,5 +674,13 @@ void ModbusController::add_on_command_sent_callback(std::function<void(int, int)
   this->command_sent_callback_.add(std::move(callback));
 }
 
+void ModbusController::add_on_online_callback(std::function<void(int, int)> &&callback) {
+  this->online_callback_.add(std::move(callback));
+}
+
+void ModbusController::add_on_offline_callback(std::function<void(int, int)> &&callback) {
+  this->offline_callback_.add(std::move(callback));
+}
+
 }  // namespace modbus_controller
 }  // namespace esphome