esphome 2025.8.3__py3-none-any.whl → 2025.9.0b1__py3-none-any.whl

esphome/components/mipi_spi/models/jc.py

@@ -255,4 +255,233 @@ DriverChip(
     ),
 )
 
+DriverChip(
+    "JC3636W518V2",
+    height=360,
+    width=360,
+    offset_height=1,
+    draw_rounding=1,
+    cs_pin=10,
+    reset_pin=47,
+    invert_colors=True,
+    color_order=MODE_RGB,
+    bus_mode=TYPE_QUAD,
+    data_rate="40MHz",
+    initsequence=(
+        (0xF0, 0x28),
+        (0xF2, 0x28),
+        (0x73, 0xF0),
+        (0x7C, 0xD1),
+        (0x83, 0xE0),
+        (0x84, 0x61),
+        (0xF2, 0x82),
+        (0xF0, 0x00),
+        (0xF0, 0x01),
+        (0xF1, 0x01),
+        (0xB0, 0x56),
+        (0xB1, 0x4D),
+        (0xB2, 0x24),
+        (0xB4, 0x87),
+        (0xB5, 0x44),
+        (0xB6, 0x8B),
+        (0xB7, 0x40),
+        (0xB8, 0x86),
+        (0xBA, 0x00),
+        (0xBB, 0x08),
+        (0xBC, 0x08),
+        (0xBD, 0x00),
+        (0xC0, 0x80),
+        (0xC1, 0x10),
+        (0xC2, 0x37),
+        (0xC3, 0x80),
+        (0xC4, 0x10),
+        (0xC5, 0x37),
+        (0xC6, 0xA9),
+        (0xC7, 0x41),
+        (0xC8, 0x01),
+        (0xC9, 0xA9),
+        (0xCA, 0x41),
+        (0xCB, 0x01),
+        (0xD0, 0x91),
+        (0xD1, 0x68),
+        (0xD2, 0x68),
+        (0xF5, 0x00, 0xA5),
+        (0xDD, 0x4F),
+        (0xDE, 0x4F),
+        (0xF1, 0x10),
+        (0xF0, 0x00),
+        (0xF0, 0x02),
+        (
+            0xE0,
+            0xF0,
+            0x0A,
+            0x10,
+            0x09,
+            0x09,
+            0x36,
+            0x35,
+            0x33,
+            0x4A,
+            0x29,
+            0x15,
+            0x15,
+            0x2E,
+            0x34,
+        ),
+        (
+            0xE1,
+            0xF0,
+            0x0A,
+            0x0F,
+            0x08,
+            0x08,
+            0x05,
+            0x34,
+            0x33,
+            0x4A,
+            0x39,
+            0x15,
+            0x15,
+            0x2D,
+            0x33,
+        ),
+        (0xF0, 0x10),
+        (0xF3, 0x10),
+        (0xE0, 0x07),
+        (0xE1, 0x00),
+        (0xE2, 0x00),
+        (0xE3, 0x00),
+        (0xE4, 0xE0),
+        (0xE5, 0x06),
+        (0xE6, 0x21),
+        (0xE7, 0x01),
+        (0xE8, 0x05),
+        (0xE9, 0x02),
+        (0xEA, 0xDA),
+        (0xEB, 0x00),
+        (0xEC, 0x00),
+        (0xED, 0x0F),
+        (0xEE, 0x00),
+        (0xEF, 0x00),
+        (0xF8, 0x00),
+        (0xF9, 0x00),
+        (0xFA, 0x00),
+        (0xFB, 0x00),
+        (0xFC, 0x00),
+        (0xFD, 0x00),
+        (0xFE, 0x00),
+        (0xFF, 0x00),
+        (0x60, 0x40),
+        (0x61, 0x04),
+        (0x62, 0x00),
+        (0x63, 0x42),
+        (0x64, 0xD9),
+        (0x65, 0x00),
+        (0x66, 0x00),
+        (0x67, 0x00),
+        (0x68, 0x00),
+        (0x69, 0x00),
+        (0x6A, 0x00),
+        (0x6B, 0x00),
+        (0x70, 0x40),
+        (0x71, 0x03),
+        (0x72, 0x00),
+        (0x73, 0x42),
+        (0x74, 0xD8),
+        (0x75, 0x00),
+        (0x76, 0x00),
+        (0x77, 0x00),
+        (0x78, 0x00),
+        (0x79, 0x00),
+        (0x7A, 0x00),
+        (0x7B, 0x00),
+        (0x80, 0x48),
+        (0x81, 0x00),
+        (0x82, 0x06),
+        (0x83, 0x02),
+        (0x84, 0xD6),
+        (0x85, 0x04),
+        (0x86, 0x00),
+        (0x87, 0x00),
+        (0x88, 0x48),
+        (0x89, 0x00),
+        (0x8A, 0x08),
+        (0x8B, 0x02),
+        (0x8C, 0xD8),
+        (0x8D, 0x04),
+        (0x8E, 0x00),
+        (0x8F, 0x00),
+        (0x90, 0x48),
+        (0x91, 0x00),
+        (0x92, 0x0A),
+        (0x93, 0x02),
+        (0x94, 0xDA),
+        (0x95, 0x04),
+        (0x96, 0x00),
+        (0x97, 0x00),
+        (0x98, 0x48),
+        (0x99, 0x00),
+        (0x9A, 0x0C),
+        (0x9B, 0x02),
+        (0x9C, 0xDC),
+        (0x9D, 0x04),
+        (0x9E, 0x00),
+        (0x9F, 0x00),
+        (0xA0, 0x48),
+        (0xA1, 0x00),
+        (0xA2, 0x05),
+        (0xA3, 0x02),
+        (0xA4, 0xD5),
+        (0xA5, 0x04),
+        (0xA6, 0x00),
+        (0xA7, 0x00),
+        (0xA8, 0x48),
+        (0xA9, 0x00),
+        (0xAA, 0x07),
+        (0xAB, 0x02),
+        (0xAC, 0xD7),
+        (0xAD, 0x04),
+        (0xAE, 0x00),
+        (0xAF, 0x00),
+        (0xB0, 0x48),
+        (0xB1, 0x00),
+        (0xB2, 0x09),
+        (0xB3, 0x02),
+        (0xB4, 0xD9),
+        (0xB5, 0x04),
+        (0xB6, 0x00),
+        (0xB7, 0x00),
+        (0xB8, 0x48),
+        (0xB9, 0x00),
+        (0xBA, 0x0B),
+        (0xBB, 0x02),
+        (0xBC, 0xDB),
+        (0xBD, 0x04),
+        (0xBE, 0x00),
+        (0xBF, 0x00),
+        (0xC0, 0x10),
+        (0xC1, 0x47),
+        (0xC2, 0x56),
+        (0xC3, 0x65),
+        (0xC4, 0x74),
+        (0xC5, 0x88),
+        (0xC6, 0x99),
+        (0xC7, 0x01),
+        (0xC8, 0xBB),
+        (0xC9, 0xAA),
+        (0xD0, 0x10),
+        (0xD1, 0x47),
+        (0xD2, 0x56),
+        (0xD3, 0x65),
+        (0xD4, 0x74),
+        (0xD5, 0x88),
+        (0xD6, 0x99),
+        (0xD7, 0x01),
+        (0xD8, 0xBB),
+        (0xD9, 0xAA),
+        (0xF3, 0x01),
+        (0xF0, 0x00),
+    ),
+)
+
 models = {}

esphome/components/mlx90614/mlx90614.cpp

@@ -50,28 +50,13 @@ bool MLX90614Component::write_emissivity_() {
   return true;
 }
 
-uint8_t MLX90614Component::crc8_pec_(const uint8_t *data, uint8_t len) {
-  uint8_t crc = 0;
-  for (uint8_t i = 0; i < len; i++) {
-    uint8_t in = data[i];
-    for (uint8_t j = 0; j < 8; j++) {
-      bool carry = (crc ^ in) & 0x80;
-      crc <<= 1;
-      if (carry)
-        crc ^= 0x07;
-      in <<= 1;
-    }
-  }
-  return crc;
-}
-
 bool MLX90614Component::write_bytes_(uint8_t reg, uint16_t data) {
   uint8_t buf[5];
   buf[0] = this->address_ << 1;
   buf[1] = reg;
   buf[2] = data & 0xFF;
   buf[3] = data >> 8;
-  buf[4] = this->crc8_pec_(buf, 4);
+  buf[4] = crc8(buf, 4, 0x00, 0x07, true);
   return this->write_bytes(reg, buf + 2, 3);
 }
 

esphome/components/mlx90614/mlx90614.h

@@ -22,7 +22,6 @@ class MLX90614Component : public PollingComponent, public i2c::I2CDevice {
  protected:
   bool write_emissivity_();
 
-  uint8_t crc8_pec_(const uint8_t *data, uint8_t len);
   bool write_bytes_(uint8_t reg, uint16_t data);
 
   sensor::Sensor *ambient_sensor_{nullptr};

esphome/components/mqtt/__init__.py

@@ -57,7 +57,7 @@ from esphome.const import (
     PLATFORM_ESP8266,
     PlatformFramework,
 )
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 
 DEPENDENCIES = ["network"]
 
@@ -321,7 +321,7 @@ def exp_mqtt_message(config):
     )
 
 
-@coroutine_with_priority(40.0)
+@coroutine_with_priority(CoroPriority.WEB)
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)

esphome/components/mqtt/mqtt_sensor.cpp

@@ -58,8 +58,13 @@ void MQTTSensorComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCon
   if (this->sensor_->get_force_update())
     root[MQTT_FORCE_UPDATE] = true;
 
-  if (this->sensor_->get_state_class() != STATE_CLASS_NONE)
-    root[MQTT_STATE_CLASS] = state_class_to_string(this->sensor_->get_state_class());
+  if (this->sensor_->get_state_class() != STATE_CLASS_NONE) {
+#ifdef USE_STORE_LOG_STR_IN_FLASH
+    root[MQTT_STATE_CLASS] = (const __FlashStringHelper *) state_class_to_string(this->sensor_->get_state_class());
+#else
+    root[MQTT_STATE_CLASS] = LOG_STR_ARG(state_class_to_string(this->sensor_->get_state_class()));
+#endif
+  }
 
   config.command_topic = false;
 }

esphome/components/ms5611/ms5611.cpp

@@ -19,13 +19,14 @@ void MS5611Component::setup() {
     this->mark_failed();
     return;
   }
-  delay(100);  // NOLINT
-  for (uint8_t offset = 0; offset < 6; offset++) {
-    if (!this->read_byte_16(MS5611_CMD_READ_PROM + (offset * 2), &this->prom_[offset])) {
-      this->mark_failed();
-      return;
+  this->set_timeout(100, [this]() {
+    for (uint8_t offset = 0; offset < 6; offset++) {
+      if (!this->read_byte_16(MS5611_CMD_READ_PROM + (offset * 2), &this->prom_[offset])) {
+        this->mark_failed();
+        return;
+      }
     }
-  }
+  });
 }
 void MS5611Component::dump_config() {
   ESP_LOGCONFIG(TAG, "MS5611:");

esphome/components/network/__init__.py

@@ -2,7 +2,7 @@ import esphome.codegen as cg
 from esphome.components.esp32 import add_idf_sdkconfig_option
 import esphome.config_validation as cv
 from esphome.const import CONF_ENABLE_IPV6, CONF_MIN_IPV6_ADDR_COUNT
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 
 CODEOWNERS = ["@esphome/core"]
 AUTO_LOAD = ["mdns"]
@@ -36,7 +36,7 @@ CONFIG_SCHEMA = cv.Schema(
 )
 
 
-@coroutine_with_priority(201.0)
+@coroutine_with_priority(CoroPriority.NETWORK)
 async def to_code(config):
     cg.add_define("USE_NETWORK")
     if CORE.using_arduino and CORE.is_esp32:

esphome/components/nextion/nextion_upload.cpp

@@ -11,7 +11,10 @@ static const char *const TAG = "nextion.upload";
 bool Nextion::upload_end_(bool successful) {
   if (successful) {
     ESP_LOGD(TAG, "Upload successful");
-    delay(1500);  // NOLINT
+    for (uint8_t i = 0; i <= 5; i++) {
+      delay(1000);     // NOLINT
+      App.feed_wdt();  // Feed the watchdog timer.
+    }
     App.safe_reboot();
   } else {
     ESP_LOGE(TAG, "Upload failed");

esphome/components/nrf52/__init__.py

@@ -2,10 +2,13 @@ from __future__ import annotations
 
 from pathlib import Path
 
+from esphome import pins
 import esphome.codegen as cg
 from esphome.components.zephyr import (
     copy_files as zephyr_copy_files,
     zephyr_add_pm_static,
+    zephyr_add_prj_conf,
+    zephyr_data,
     zephyr_set_core_data,
     zephyr_to_code,
 )
@@ -18,6 +21,8 @@ import esphome.config_validation as cv
 from esphome.const import (
     CONF_BOARD,
     CONF_FRAMEWORK,
+    CONF_ID,
+    CONF_RESET_PIN,
     KEY_CORE,
     KEY_FRAMEWORK_VERSION,
     KEY_TARGET_FRAMEWORK,
@@ -25,7 +30,7 @@ from esphome.const import (
     PLATFORM_NRF52,
     ThreadModel,
 )
-from esphome.core import CORE, EsphomeError, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, EsphomeError, coroutine_with_priority
 from esphome.storage_json import StorageJSON
 from esphome.types import ConfigType
 
@@ -90,19 +95,44 @@ def _detect_bootloader(config: ConfigType) -> ConfigType:
     return config
 
 
+nrf52_ns = cg.esphome_ns.namespace("nrf52")
+DeviceFirmwareUpdate = nrf52_ns.class_("DeviceFirmwareUpdate", cg.Component)
+
+CONF_DFU = "dfu"
+
 CONFIG_SCHEMA = cv.All(
+    _detect_bootloader,
+    set_core_data,
     cv.Schema(
         {
             cv.Required(CONF_BOARD): cv.string_strict,
             cv.Optional(KEY_BOOTLOADER): cv.one_of(*BOOTLOADERS, lower=True),
+            cv.Optional(CONF_DFU): cv.Schema(
+                {
+                    cv.GenerateID(): cv.declare_id(DeviceFirmwareUpdate),
+                    cv.Required(CONF_RESET_PIN): pins.gpio_output_pin_schema,
+                }
+            ),
         }
     ),
-    _detect_bootloader,
-    set_core_data,
 )
 
 
-@coroutine_with_priority(1000)
+def _validate_mcumgr(config):
+    bootloader = zephyr_data()[KEY_BOOTLOADER]
+    if bootloader == BOOTLOADER_MCUBOOT:
+        raise cv.Invalid(f"'{bootloader}' bootloader does not support DFU")
+
+
+def _final_validate(config):
+    if CONF_DFU in config:
+        _validate_mcumgr(config)
+
+
+FINAL_VALIDATE_SCHEMA = _final_validate
+
+
+@coroutine_with_priority(CoroPriority.PLATFORM)
 async def to_code(config: ConfigType) -> None:
     """Convert the configuration to code."""
     cg.add_platformio_option("board", config[CONF_BOARD])
@@ -119,8 +149,8 @@ async def to_code(config: ConfigType) -> None:
     cg.add_platformio_option(
         "platform_packages",
         [
-            "platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v2.6.1-4.zip",
-            "platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng/archive/refs/tags/v0.16.1-1.zip",
+            "platformio/framework-zephyr@https://github.com/tomaszduda23/framework-sdk-nrf/archive/refs/tags/v2.6.1-7.zip",
+            "platformio/toolchain-gccarmnoneeabi@https://github.com/tomaszduda23/toolchain-sdk-ng/archive/refs/tags/v0.17.4-0.zip",
         ],
     )
 
@@ -136,6 +166,19 @@ async def to_code(config: ConfigType) -> None:
 
     zephyr_to_code(config)
 
+    if dfu_config := config.get(CONF_DFU):
+        CORE.add_job(_dfu_to_code, dfu_config)
+
+
+@coroutine_with_priority(CoroPriority.DIAGNOSTICS)
+async def _dfu_to_code(dfu_config):
+    cg.add_define("USE_NRF52_DFU")
+    var = cg.new_Pvariable(dfu_config[CONF_ID])
+    pin = await cg.gpio_pin_expression(dfu_config[CONF_RESET_PIN])
+    cg.add(var.set_reset_pin(pin))
+    zephyr_add_prj_conf("CDC_ACM_DTE_RATE_CALLBACK_SUPPORT", True)
+    await cg.register_component(var, dfu_config)
+
 
 def copy_files() -> None:
     """Copy files to the build directory."""

esphome/components/nrf52/const.py

@@ -2,6 +2,7 @@ BOOTLOADER_ADAFRUIT = "adafruit"
 BOOTLOADER_ADAFRUIT_NRF52_SD132 = "adafruit_nrf52_sd132"
 BOOTLOADER_ADAFRUIT_NRF52_SD140_V6 = "adafruit_nrf52_sd140_v6"
 BOOTLOADER_ADAFRUIT_NRF52_SD140_V7 = "adafruit_nrf52_sd140_v7"
+
 EXTRA_ADC = [
     "VDD",
     "VDDHDIV5",

esphome/components/nrf52/dfu.cpp

@@ -0,0 +1,51 @@
+#include "dfu.h"
+
+#ifdef USE_NRF52_DFU
+
+#include <zephyr/device.h>
+#include <zephyr/drivers/uart.h>
+#include <zephyr/drivers/uart/cdc_acm.h>
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace nrf52 {
+
+static const char *const TAG = "dfu";
+
+volatile bool goto_dfu = false;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
+
+static const uint32_t DFU_DBL_RESET_MAGIC = 0x5A1AD5;  // SALADS
+
+#define DEVICE_AND_COMMA(node_id) DEVICE_DT_GET(node_id),
+
+static void cdc_dte_rate_callback(const struct device * /*unused*/, uint32_t rate) {
+  if (rate == 1200) {
+    goto_dfu = true;
+  }
+}
+void DeviceFirmwareUpdate::setup() {
+  this->reset_pin_->setup();
+  const struct device *cdc_dev[] = {DT_FOREACH_STATUS_OKAY(zephyr_cdc_acm_uart, DEVICE_AND_COMMA)};
+  for (auto &idx : cdc_dev) {
+    cdc_acm_dte_rate_callback_set(idx, cdc_dte_rate_callback);
+  }
+}
+
+void DeviceFirmwareUpdate::loop() {
+  if (goto_dfu) {
+    goto_dfu = false;
+    volatile uint32_t *dbl_reset_mem = (volatile uint32_t *) 0x20007F7C;
+    (*dbl_reset_mem) = DFU_DBL_RESET_MAGIC;
+    this->reset_pin_->digital_write(true);
+  }
+}
+
+void DeviceFirmwareUpdate::dump_config() {
+  ESP_LOGCONFIG(TAG, "DFU:");
+  LOG_PIN("  RESET Pin: ", this->reset_pin_);
+}
+
+}  // namespace nrf52
+}  // namespace esphome
+
+#endif

esphome/components/nrf52/dfu.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+#ifdef USE_NRF52_DFU
+#include "esphome/core/component.h"
+#include "esphome/core/gpio.h"
+
+namespace esphome {
+namespace nrf52 {
+class DeviceFirmwareUpdate : public Component {
+ public:
+  void setup() override;
+  void loop() override;
+  void set_reset_pin(GPIOPin *reset) { this->reset_pin_ = reset; }
+  void dump_config() override;
+
+ protected:
+  GPIOPin *reset_pin_;
+};
+
+}  // namespace nrf52
+}  // namespace esphome
+
+#endif

esphome/components/ntc/ntc.cpp

@@ -11,7 +11,7 @@ void NTC::setup() {
   if (this->sensor_->has_state())
     this->process_(this->sensor_->state);
 }
-void NTC::dump_config() { LOG_SENSOR("", "NTC Sensor", this) }
+void NTC::dump_config() { LOG_SENSOR("", "NTC Sensor", this); }
 float NTC::get_setup_priority() const { return setup_priority::DATA; }
 void NTC::process_(float value) {
   if (std::isnan(value)) {

esphome/components/number/__init__.py

@@ -76,7 +76,7 @@ from esphome.const import (
     DEVICE_CLASS_WIND_DIRECTION,
     DEVICE_CLASS_WIND_SPEED,
 )
-from esphome.core import CORE, coroutine_with_priority
+from esphome.core import CORE, CoroPriority, coroutine_with_priority
 from esphome.core.entity_helpers import entity_duplicate_validator, setup_entity
 from esphome.cpp_generator import MockObjClass
 
@@ -321,7 +321,7 @@ async def number_in_range_to_code(config, condition_id, template_arg, args):
     return var
 
 
-@coroutine_with_priority(100.0)
+@coroutine_with_priority(CoroPriority.CORE)
 async def to_code(config):
     cg.add_global(number_ns.using)
 

esphome/components/number/automation.cpp

@@ -15,7 +15,7 @@ void ValueRangeTrigger::setup() {
   float local_min = this->min_.value(0.0);
   float local_max = this->max_.value(0.0);
   convert hash = {.from = (local_max - local_min)};
-  uint32_t myhash = hash.to ^ this->parent_->get_object_id_hash();
+  uint32_t myhash = hash.to ^ this->parent_->get_preference_hash();
   this->rtc_ = global_preferences->make_preference<bool>(myhash);
   bool initial_state;
   if (this->rtc_.load(&initial_state)) {

esphome/components/number/number.cpp

@@ -6,6 +6,27 @@ namespace number {
 
 static const char *const TAG = "number";
 
+// Function implementation of LOG_NUMBER macro to reduce code size
+void log_number(const char *tag, const char *prefix, const char *type, Number *obj) {
+  if (obj == nullptr) {
+    return;
+  }
+
+  ESP_LOGCONFIG(tag, "%s%s '%s'", prefix, type, obj->get_name().c_str());
+
+  if (!obj->get_icon_ref().empty()) {
+    ESP_LOGCONFIG(tag, "%s  Icon: '%s'", prefix, obj->get_icon_ref().c_str());
+  }
+
+  if (!obj->traits.get_unit_of_measurement_ref().empty()) {
+    ESP_LOGCONFIG(tag, "%s  Unit of Measurement: '%s'", prefix, obj->traits.get_unit_of_measurement_ref().c_str());
+  }
+
+  if (!obj->traits.get_device_class_ref().empty()) {
+    ESP_LOGCONFIG(tag, "%s  Device Class: '%s'", prefix, obj->traits.get_device_class_ref().c_str());
+  }
+}
+
 void Number::publish_state(float state) {
   this->set_has_state(true);
   this->state = state;

esphome/components/number/number.h

@@ -9,19 +9,10 @@
 namespace esphome {
 namespace number {
 
-#define LOG_NUMBER(prefix, type, obj) \
-  if ((obj) != nullptr) { \
-    ESP_LOGCONFIG(TAG, "%s%s '%s'", prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str()); \
-    if (!(obj)->get_icon().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
-    } \
-    if (!(obj)->traits.get_unit_of_measurement().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Unit of Measurement: '%s'", prefix, (obj)->traits.get_unit_of_measurement().c_str()); \
-    } \
-    if (!(obj)->traits.get_device_class().empty()) { \
-      ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->traits.get_device_class().c_str()); \
-    } \
-  }
+class Number;
+void log_number(const char *tag, const char *prefix, const char *type, Number *obj);
+
+#define LOG_NUMBER(prefix, type, obj) log_number(TAG, prefix, LOG_STR_LITERAL(type), obj)
 
 #define SUB_NUMBER(name) \
  protected: \

esphome/components/opentherm/hub.h

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <vector>
+#include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
-#include "esphome/core/component.h"
 #include "esphome/core/log.h"
-#include <vector>
 
 #include "opentherm.h"
 
@@ -17,21 +17,21 @@
 #endif
 
 #ifdef OPENTHERM_USE_SWITCH
-#include "esphome/components/opentherm/switch/switch.h"
+#include "esphome/components/opentherm/switch/opentherm_switch.h"
 #endif
 
 #ifdef OPENTHERM_USE_OUTPUT
-#include "esphome/components/opentherm/output/output.h"
+#include "esphome/components/opentherm/output/opentherm_output.h"
 #endif
 
 #ifdef OPENTHERM_USE_NUMBER
-#include "esphome/components/opentherm/number/number.h"
+#include "esphome/components/opentherm/number/opentherm_number.h"
 #endif
 
+#include <functional>
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
-#include <functional>
 
 #include "opentherm_macros.h"