From 2910eb2ef70272719a0d2532e7e426d3d59aceb6 Mon Sep 17 00:00:00 2001
From: Nippey <matthias@dornuweb.de>
Date: Thu, 12 Oct 2023 19:56:30 +0200
Subject: [PATCH 001/131] Update htu21d.cpp, fix publishing of heater level
 (#5520)

---
 esphome/components/htu21d/htu21d.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/htu21d/htu21d.cpp b/esphome/components/htu21d/htu21d.cpp
index 5030ac4d0f..a8133ae32e 100644
--- a/esphome/components/htu21d/htu21d.cpp
+++ b/esphome/components/htu21d/htu21d.cpp
@@ -76,7 +76,7 @@ void HTU21DComponent::update() {
   if (this->humidity_ != nullptr)
     this->humidity_->publish_state(humidity);
   if (this->heater_ != nullptr)
-    this->heater_->publish_state(humidity);
+    this->heater_->publish_state(heater_level);
   this->status_clear_warning();
 }
 

From 04b708c336ff93c907fcbbc3a7ab7a812293f8e7 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Thu, 12 Oct 2023 20:20:31 +0200
Subject: [PATCH 002/131] Splits FastLed test scripts out of test1.yaml (#5522)

---
 tests/test1.1.yaml | 205 +++++++++++++++++++++++++++++++++++++++++++++
 tests/test1.yaml   | 139 ------------------------------
 2 files changed, 205 insertions(+), 139 deletions(-)
 create mode 100644 tests/test1.1.yaml

diff --git a/tests/test1.1.yaml b/tests/test1.1.yaml
new file mode 100644
index 0000000000..3bad4e0492
--- /dev/null
+++ b/tests/test1.1.yaml
@@ -0,0 +1,205 @@
+---
+substitutions:
+  devicename: test1_1
+  sensorname: my
+  textname: template
+  roomname: fastled_room
+
+esphome:
+  name: test1-1
+  name_add_mac_suffix: true
+  platform: ESP32
+  board: nodemcu-32s
+  platformio_options:
+    board_build.partitions: huge_app.csv
+  on_loop:
+    then:
+      - light.addressable_set:
+          id: addr1
+          range_from: 0
+          range_to: 100
+          red: 100%
+          green: !lambda "return 255;"
+          blue: 0%
+          white: 100%
+
+wled:
+
+wifi:
+  networks:
+    - ssid: "MySSID"
+      password: "password1"
+
+uart:
+  - id: adalight_uart
+    tx_pin: GPIO25
+    rx_pin: GPIO26
+    baud_rate: 115200
+    rx_buffer_size: 1024
+
+adalight:
+
+network:
+
+e131:
+
+power_supply:
+  id: atx_power_supply
+  enable_time: 20ms
+  keep_on_time: 10s
+  pin:
+    number: 13
+    inverted: true
+
+i2c:
+  sda: 21
+  scl: 22
+  scan: true
+  frequency: 100kHz
+  setup_priority: -100
+  id: i2c_bus
+
+pca9685:
+  frequency: 500
+  address: 0x0
+  i2c_id: i2c_bus
+
+output:
+  - platform: pca9685
+    id: pca_0
+    channel: 0
+  - platform: pca9685
+    id: pca_1
+    channel: 1
+  - platform: pca9685
+    id: pca_2
+    channel: 2
+
+light:
+  - platform: rgb
+    name: Living Room Lights
+    id: ${roomname}_lights
+    red: pca_0
+    green: pca_1
+    blue: pca_2
+  - platform: fastled_clockless
+    id: addr1
+    chipset: WS2811
+    pin: GPIO23
+    num_leds: 60
+    rgb_order: BRG
+    max_refresh_rate: 20ms
+    power_supply: atx_power_supply
+    color_correct: [75%, 100%, 50%]
+    name: FastLED WS2811 Light
+    effects:
+      - addressable_color_wipe:
+      - addressable_color_wipe:
+          name: Color Wipe Effect With Custom Values
+          colors:
+            - red: 100%
+              green: 100%
+              blue: 100%
+              num_leds: 1
+            - red: 0%
+              green: 0%
+              blue: 0%
+              num_leds: 1
+          add_led_interval: 100ms
+          reverse: false
+      - addressable_scan:
+      - addressable_scan:
+          name: Scan Effect With Custom Values
+          move_interval: 100ms
+      - addressable_twinkle:
+      - addressable_twinkle:
+          name: Twinkle Effect With Custom Values
+          twinkle_probability: 5%
+          progress_interval: 4ms
+      - addressable_random_twinkle:
+      - addressable_random_twinkle:
+          name: Random Twinkle Effect With Custom Values
+          twinkle_probability: 5%
+          progress_interval: 32ms
+      - addressable_fireworks:
+      - addressable_fireworks:
+          name: Fireworks Effect With Custom Values
+          update_interval: 32ms
+          spark_probability: 10%
+          use_random_color: false
+          fade_out_rate: 120
+      - addressable_flicker:
+      - addressable_flicker:
+          name: Flicker Effect With Custom Values
+          update_interval: 16ms
+          intensity: 5%
+      - addressable_lambda:
+          name: Test For Custom Lambda Effect
+          lambda: |-
+            if (initial_run) {
+              it[0] = current_color;
+            }
+
+      - wled:
+          port: 11111
+
+      - adalight:
+          uart_id: adalight_uart
+
+      - e131:
+          universe: 1
+
+      - automation:
+          name: Custom Effect
+          sequence:
+            - light.addressable_set:
+                id: addr1
+                red: 100%
+                green: 100%
+                blue: 0%
+            - delay: 100ms
+            - light.addressable_set:
+                id: addr1
+                red: 0%
+                green: 100%
+                blue: 0%
+
+  - platform: fastled_spi
+    id: addr2
+    chipset: WS2801
+    data_pin: GPIO23
+    clock_pin: GPIO22
+    data_rate: 2MHz
+    num_leds: 60
+    rgb_order: BRG
+    name: FastLED SPI Light
+  - platform: neopixelbus
+    id: addr3
+    name: Neopixelbus Light
+    gamma_correct: 2.8
+    color_correct: [0.0, 0.0, 0.0, 0.0]
+    default_transition_length: 10s
+    power_supply: atx_power_supply
+    effects:
+      - addressable_flicker:
+          name: Flicker Effect With Custom Values
+          update_interval: 16ms
+          intensity: 5%
+    type: GRBW
+    variant: SK6812
+    method: ESP32_I2S_0
+    num_leds: 60
+    pin: GPIO23
+  - platform: partition
+    name: Partition Light
+    segments:
+      - id: addr1
+        from: 0
+        to: 0
+      - id: addr2
+        from: 1
+        to: 10
+      - id: addr2
+        from: 20
+        to: 25
+      - single_light_id: ${roomname}_lights
diff --git a/tests/test1.yaml b/tests/test1.yaml
index c504012481..6d42e325d8 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -25,14 +25,6 @@ esphome:
     then:
       - lambda: >-
           ESP_LOGV("main", "ON LOOP!");
-      - light.addressable_set:
-          id: addr1
-          range_from: 0
-          range_to: 100
-          red: 100%
-          green: !lambda "return 255;"
-          blue: 0%
-          white: 100%
       - http_request.get:
           url: https://esphome.io
           headers:
@@ -222,12 +214,6 @@ uart:
         - lambda: UARTDebug::log_string(direction, bytes);
         - lambda: UARTDebug::log_int(direction, bytes, ',');
         - lambda: UARTDebug::log_binary(direction, bytes, ';');
-
-  - id: adalight_uart
-    tx_pin: GPIO25
-    rx_pin: GPIO26
-    baud_rate: 115200
-    rx_buffer_size: 1024
   - id: ld2410_uart
     tx_pin: 18
     rx_pin: 23
@@ -300,10 +286,6 @@ as3935_spi:
   cs_pin: GPIO12
   irq_pin: GPIO13
 
-wled:
-
-adalight:
-
 esp32_ble:
   io_capability: keyboard_only
 
@@ -2073,8 +2055,6 @@ output:
     ud_pin: GPIO27
     initial_value: 0.5
 
-e131:
-
 light:
   - platform: binary
     name: Desk Lamp
@@ -2163,125 +2143,6 @@ light:
     brightness: pca_6
     cold_white_color_temperature: 153 mireds
     warm_white_color_temperature: 500 mireds
-  - platform: fastled_clockless
-    id: addr1
-    chipset: WS2811
-    pin: GPIO23
-    num_leds: 60
-    rgb_order: BRG
-    max_refresh_rate: 20ms
-    power_supply: atx_power_supply
-    color_correct: [75%, 100%, 50%]
-    name: FastLED WS2811 Light
-    effects:
-      - addressable_color_wipe:
-      - addressable_color_wipe:
-          name: Color Wipe Effect With Custom Values
-          colors:
-            - red: 100%
-              green: 100%
-              blue: 100%
-              num_leds: 1
-            - red: 0%
-              green: 0%
-              blue: 0%
-              num_leds: 1
-          add_led_interval: 100ms
-          reverse: false
-      - addressable_scan:
-      - addressable_scan:
-          name: Scan Effect With Custom Values
-          move_interval: 100ms
-      - addressable_twinkle:
-      - addressable_twinkle:
-          name: Twinkle Effect With Custom Values
-          twinkle_probability: 5%
-          progress_interval: 4ms
-      - addressable_random_twinkle:
-      - addressable_random_twinkle:
-          name: Random Twinkle Effect With Custom Values
-          twinkle_probability: 5%
-          progress_interval: 32ms
-      - addressable_fireworks:
-      - addressable_fireworks:
-          name: Fireworks Effect With Custom Values
-          update_interval: 32ms
-          spark_probability: 10%
-          use_random_color: false
-          fade_out_rate: 120
-      - addressable_flicker:
-      - addressable_flicker:
-          name: Flicker Effect With Custom Values
-          update_interval: 16ms
-          intensity: 5%
-      - addressable_lambda:
-          name: Test For Custom Lambda Effect
-          lambda: |-
-            if (initial_run) {
-              it[0] = current_color;
-            }
-
-      - wled:
-          port: 11111
-
-      - adalight:
-          uart_id: adalight_uart
-
-      - automation:
-          name: Custom Effect
-          sequence:
-            - light.addressable_set:
-                id: addr1
-                red: 100%
-                green: 100%
-                blue: 0%
-            - delay: 100ms
-            - light.addressable_set:
-                id: addr1
-                red: 0%
-                green: 100%
-                blue: 0%
-      - e131:
-          universe: 1
-  - platform: fastled_spi
-    id: addr2
-    chipset: WS2801
-    data_pin: GPIO23
-    clock_pin: GPIO22
-    data_rate: 2MHz
-    num_leds: 60
-    rgb_order: BRG
-    name: FastLED SPI Light
-  - platform: neopixelbus
-    id: addr3
-    name: Neopixelbus Light
-    gamma_correct: 2.8
-    color_correct: [0.0, 0.0, 0.0, 0.0]
-    default_transition_length: 10s
-    power_supply: atx_power_supply
-    effects:
-      - addressable_flicker:
-          name: Flicker Effect With Custom Values
-          update_interval: 16ms
-          intensity: 5%
-    type: GRBW
-    variant: SK6812
-    method: ESP32_I2S_0
-    num_leds: 60
-    pin: GPIO23
-  - platform: partition
-    name: Partition Light
-    segments:
-      - id: addr1
-        from: 0
-        to: 0
-      - id: addr2
-        from: 1
-        to: 10
-      - id: addr2
-        from: 20
-        to: 25
-      - single_light_id: ${roomname}_lights
 
 remote_transmitter:
   - pin: 32

From 7c890d8ebc2daf91268d1758548076880d0b7c64 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 12 Oct 2023 14:09:07 -0500
Subject: [PATCH 003/131] BD5758D - Add delays and ACKs (#5524)

---
 esphome/components/bp5758d/bp5758d.cpp | 30 ++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/esphome/components/bp5758d/bp5758d.cpp b/esphome/components/bp5758d/bp5758d.cpp
index 71a81f7e6c..87c4165275 100644
--- a/esphome/components/bp5758d/bp5758d.cpp
+++ b/esphome/components/bp5758d/bp5758d.cpp
@@ -17,12 +17,16 @@ static const uint8_t BP5758D_ADDR_START_2CH = 0b00100000;
 static const uint8_t BP5758D_ADDR_START_5CH = 0b00110000;
 static const uint8_t BP5758D_ALL_DATA_CHANNEL_ENABLEMENT = 0b00011111;
 
+static const uint8_t BP5758D_DELAY = 2;
+
 void BP5758D::setup() {
   ESP_LOGCONFIG(TAG, "Setting up BP5758D Output Component...");
   this->data_pin_->setup();
   this->data_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
   this->clock_pin_->setup();
   this->clock_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
   this->channel_current_.resize(5, 0);
   this->pwm_amounts_.resize(5, 0);
 }
@@ -39,11 +43,11 @@ void BP5758D::loop() {
   uint8_t data[17];
   if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
       this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    for (int i = 1; i < 16; i++)
+    for (int i = 1; i < 17; i++)
       data[i] = 0;
 
     // First turn all channels off
-    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_3CH;
+    data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_START_5CH;
     this->write_buffer_(data, 17);
     // Then sleep
     data[0] = BP5758D_MODEL_ID + BP5758D_ADDR_STANDBY;
@@ -123,28 +127,42 @@ void BP5758D::set_channel_value_(uint8_t channel, uint16_t value) {
 void BP5758D::set_channel_current_(uint8_t channel, uint8_t current) { this->channel_current_[channel] = current; }
 
 void BP5758D::write_bit_(bool value) {
-  this->clock_pin_->digital_write(false);
   this->data_pin_->digital_write(value);
+  delayMicroseconds(BP5758D_DELAY);
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(BP5758D_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
 }
 
 void BP5758D::write_byte_(uint8_t data) {
   for (uint8_t mask = 0x80; mask; mask >>= 1) {
     this->write_bit_(data & mask);
   }
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(true);
+
+  // ack bit
+  this->data_pin_->pin_mode(gpio::FLAG_INPUT);
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(BP5758D_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
+  this->data_pin_->pin_mode(gpio::FLAG_OUTPUT);
 }
 
 void BP5758D::write_buffer_(uint8_t *buffer, uint8_t size) {
   this->data_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(BP5758D_DELAY);
+
   for (uint32_t i = 0; i < size; i++) {
     this->write_byte_(buffer[i]);
   }
-  this->clock_pin_->digital_write(false);
+
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(BP5758D_DELAY);
   this->data_pin_->digital_write(true);
+  delayMicroseconds(BP5758D_DELAY);
 }
 
 }  // namespace bp5758d

From 33ebfd221ea5c0000a67da326eff16dcbe71581f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 13 Oct 2023 12:46:46 +1300
Subject: [PATCH 004/131] Update Improv BLE component (#5518)

---
 .../esp32_ble_server/ble_service.cpp          |  2 +
 .../components/esp32_ble_server/ble_service.h |  2 +-
 esphome/components/esp32_improv/__init__.py   |  2 +-
 .../esp32_improv/esp32_improv_component.cpp   | 79 +++++++++++--------
 .../esp32_improv/esp32_improv_component.h     | 29 +++++--
 esphome/components/output/__init__.py         |  1 +
 esphome/core/defines.h                        |  3 +-
 7 files changed, 79 insertions(+), 39 deletions(-)

diff --git a/esphome/components/esp32_ble_server/ble_service.cpp b/esphome/components/esp32_ble_server/ble_service.cpp
index 4fcd2e3e79..e5aaebc137 100644
--- a/esphome/components/esp32_ble_server/ble_service.cpp
+++ b/esphome/components/esp32_ble_server/ble_service.cpp
@@ -90,6 +90,8 @@ void BLEService::stop() {
     ESP_LOGE(TAG, "esp_ble_gatts_stop_service failed: %d", err);
     return;
   }
+  esp32_ble::global_ble->get_advertising()->remove_service_uuid(this->uuid_);
+  esp32_ble::global_ble->get_advertising()->start();
   this->running_state_ = STOPPING;
 }
 
diff --git a/esphome/components/esp32_ble_server/ble_service.h b/esphome/components/esp32_ble_server/ble_service.h
index 2766c931a7..93b4217517 100644
--- a/esphome/components/esp32_ble_server/ble_service.h
+++ b/esphome/components/esp32_ble_server/ble_service.h
@@ -7,11 +7,11 @@
 
 #ifdef USE_ESP32
 
+#include <esp_bt_defs.h>
 #include <esp_gap_ble_api.h>
 #include <esp_gatt_defs.h>
 #include <esp_gattc_api.h>
 #include <esp_gatts_api.h>
-#include <esp_bt_defs.h>
 
 namespace esphome {
 namespace esp32_ble_server {
diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index ae7f0b6427..fba2e55ae8 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -4,7 +4,7 @@ from esphome.components import binary_sensor, output, esp32_ble_server
 from esphome.const import CONF_ID
 
 
-AUTO_LOAD = ["binary_sensor", "output", "esp32_ble_server"]
+AUTO_LOAD = ["esp32_ble_server"]
 CODEOWNERS = ["@jesserockz"]
 CONFLICTS_WITH = ["esp32_ble_beacon"]
 DEPENDENCIES = ["wifi", "esp32"]
diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 85013c006b..5bdf7d19fe 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -18,6 +18,17 @@ ESP32ImprovComponent::ESP32ImprovComponent() { global_improv_component = this; }
 void ESP32ImprovComponent::setup() {
   this->service_ = global_ble_server->create_service(improv::SERVICE_UUID, true);
   this->setup_characteristics();
+
+#ifdef USE_BINARY_SENSOR
+  if (this->authorizer_ != nullptr) {
+    this->authorizer_->add_on_state_callback([this](bool state) {
+      if (state) {
+        this->authorized_start_ = millis();
+        this->identify_start_ = 0;
+      }
+    });
+  }
+#endif
 }
 
 void ESP32ImprovComponent::setup_characteristics() {
@@ -50,8 +61,10 @@ void ESP32ImprovComponent::setup_characteristics() {
   BLEDescriptor *capabilities_descriptor = new BLE2902();
   this->capabilities_->add_descriptor(capabilities_descriptor);
   uint8_t capabilities = 0x00;
+#ifdef USE_OUTPUT
   if (this->status_indicator_ != nullptr)
     capabilities |= improv::CAPABILITY_IDENTIFY;
+#endif
   this->capabilities_->set_value(capabilities);
   this->setup_complete_ = true;
 }
@@ -63,8 +76,7 @@ void ESP32ImprovComponent::loop() {
 
   switch (this->state_) {
     case improv::STATE_STOPPED:
-      if (this->status_indicator_ != nullptr)
-        this->status_indicator_->turn_off();
+      this->set_status_indicator_state_(false);
 
       if (this->service_->is_created() && this->should_start_ && this->setup_complete_) {
         if (this->service_->is_running()) {
@@ -80,14 +92,17 @@ void ESP32ImprovComponent::loop() {
       }
       break;
     case improv::STATE_AWAITING_AUTHORIZATION: {
-      if (this->authorizer_ == nullptr || this->authorizer_->state) {
+#ifdef USE_BINARY_SENSOR
+      if (this->authorizer_ == nullptr ||
+          (this->authorized_start_ != 0 && ((now - this->authorized_start_) < this->authorized_duration_))) {
         this->set_state_(improv::STATE_AUTHORIZED);
-        this->authorized_start_ = now;
-      } else {
-        if (this->status_indicator_ != nullptr) {
-          if (!this->check_identify_())
-            this->status_indicator_->turn_on();
-        }
+      } else
+#else
+      this->set_state_(improv::STATE_AUTHORIZED);
+#endif
+      {
+        if (!this->check_identify_())
+          this->set_status_indicator_state_(true);
       }
       break;
     }
@@ -99,25 +114,13 @@ void ESP32ImprovComponent::loop() {
           return;
         }
       }
-      if (this->status_indicator_ != nullptr) {
-        if (!this->check_identify_()) {
-          if ((now % 1000) < 500) {
-            this->status_indicator_->turn_on();
-          } else {
-            this->status_indicator_->turn_off();
-          }
-        }
+      if (!this->check_identify_()) {
+        this->set_status_indicator_state_((now % 1000) < 500);
       }
       break;
     }
     case improv::STATE_PROVISIONING: {
-      if (this->status_indicator_ != nullptr) {
-        if ((now % 200) < 100) {
-          this->status_indicator_->turn_on();
-        } else {
-          this->status_indicator_->turn_off();
-        }
-      }
+      this->set_status_indicator_state_((now % 200) < 100);
       if (wifi::global_wifi_component->is_connected()) {
         wifi::global_wifi_component->save_wifi_sta(this->connecting_sta_.get_ssid(),
                                                    this->connecting_sta_.get_password());
@@ -142,13 +145,27 @@ void ESP32ImprovComponent::loop() {
     }
     case improv::STATE_PROVISIONED: {
       this->incoming_data_.clear();
-      if (this->status_indicator_ != nullptr)
-        this->status_indicator_->turn_off();
+      this->set_status_indicator_state_(false);
       break;
     }
   }
 }
 
+void ESP32ImprovComponent::set_status_indicator_state_(bool state) {
+#ifdef USE_OUTPUT
+  if (this->status_indicator_ == nullptr)
+    return;
+  if (this->status_indicator_state_ == state)
+    return;
+  this->status_indicator_state_ = state;
+  if (state) {
+    this->status_indicator_->turn_on();
+  } else {
+    this->status_indicator_->turn_off();
+  }
+#endif
+}
+
 bool ESP32ImprovComponent::check_identify_() {
   uint32_t now = millis();
 
@@ -156,11 +173,7 @@ bool ESP32ImprovComponent::check_identify_() {
 
   if (identify) {
     uint32_t time = now % 1000;
-    if (time < 600 && time % 200 < 100) {
-      this->status_indicator_->turn_on();
-    } else {
-      this->status_indicator_->turn_off();
-    }
+    this->set_status_indicator_state_(time < 600 && time % 200 < 100);
   }
   return identify;
 }
@@ -213,8 +226,12 @@ float ESP32ImprovComponent::get_setup_priority() const { return setup_priority::
 
 void ESP32ImprovComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "ESP32 Improv:");
+#ifdef USE_BINARY_SENSOR
   LOG_BINARY_SENSOR("  ", "Authorizer", this->authorizer_);
+#endif
+#ifdef USE_OUTPUT
   ESP_LOGCONFIG(TAG, "  Status Indicator: '%s'", YESNO(this->status_indicator_ != nullptr));
+#endif
 }
 
 void ESP32ImprovComponent::process_incoming_data_() {
diff --git a/esphome/components/esp32_improv/esp32_improv_component.h b/esphome/components/esp32_improv/esp32_improv_component.h
index 1a142c94b6..ba9892d6a5 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.h
+++ b/esphome/components/esp32_improv/esp32_improv_component.h
@@ -1,14 +1,22 @@
 #pragma once
 
-#include "esphome/components/binary_sensor/binary_sensor.h"
-#include "esphome/components/esp32_ble_server/ble_characteristic.h"
-#include "esphome/components/esp32_ble_server/ble_server.h"
-#include "esphome/components/output/binary_output.h"
-#include "esphome/components/wifi/wifi_component.h"
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
 
+#include "esphome/components/esp32_ble_server/ble_characteristic.h"
+#include "esphome/components/esp32_ble_server/ble_server.h"
+#include "esphome/components/wifi/wifi_component.h"
+
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
+
+#ifdef USE_OUTPUT
+#include "esphome/components/output/binary_output.h"
+#endif
+
 #include <vector>
 
 #ifdef USE_ESP32
@@ -34,8 +42,12 @@ class ESP32ImprovComponent : public Component, public BLEServiceComponent {
   void stop() override;
   bool is_active() const { return this->state_ != improv::STATE_STOPPED; }
 
+#ifdef USE_BINARY_SENSOR
   void set_authorizer(binary_sensor::BinarySensor *authorizer) { this->authorizer_ = authorizer; }
+#endif
+#ifdef USE_OUTPUT
   void set_status_indicator(output::BinaryOutput *status_indicator) { this->status_indicator_ = status_indicator; }
+#endif
   void set_identify_duration(uint32_t identify_duration) { this->identify_duration_ = identify_duration; }
   void set_authorized_duration(uint32_t authorized_duration) { this->authorized_duration_ = authorized_duration; }
 
@@ -58,12 +70,19 @@ class ESP32ImprovComponent : public Component, public BLEServiceComponent {
   BLECharacteristic *rpc_response_;
   BLECharacteristic *capabilities_;
 
+#ifdef USE_BINARY_SENSOR
   binary_sensor::BinarySensor *authorizer_{nullptr};
+#endif
+#ifdef USE_OUTPUT
   output::BinaryOutput *status_indicator_{nullptr};
+#endif
 
   improv::State state_{improv::STATE_STOPPED};
   improv::Error error_state_{improv::ERROR_NONE};
 
+  bool status_indicator_state_{false};
+  void set_status_indicator_state_(bool state);
+
   void set_state_(improv::State state);
   void set_error_(improv::Error error);
   void send_response_(std::vector<uint8_t> &response);
diff --git a/esphome/components/output/__init__.py b/esphome/components/output/__init__.py
index 4f1fb33fe7..726d1ac084 100644
--- a/esphome/components/output/__init__.py
+++ b/esphome/components/output/__init__.py
@@ -106,4 +106,5 @@ async def output_set_level_to_code(config, action_id, template_arg, args):
 
 
 async def to_code(config):
+    cg.add_define("USE_OUTPUT")
     cg.add_global(output_ns.using)
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 1e0df74eec..71493119c0 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -37,6 +37,7 @@
 #define USE_OTA
 #define USE_OTA_PASSWORD
 #define USE_OTA_STATE_CALLBACK
+#define USE_OUTPUT
 #define USE_POWER_SUPPLY
 #define USE_QR_CODE
 #define USE_SELECT
@@ -117,6 +118,6 @@
 #endif
 
 // Disabled feature flags
-//#define USE_BSEC  // Requires a library with proprietary license.
+// #define USE_BSEC  // Requires a library with proprietary license.
 
 #define USE_DASHBOARD_IMPORT

From f5c12b50cea418ca0b8315c294575089f529d120 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 12 Oct 2023 18:51:19 -0500
Subject: [PATCH 005/131] SM10BIT_BASE - Add delays and ACKs, clear all
 channels before sleeping. (#5526)

---
 .../components/sm10bit_base/sm10bit_base.cpp  | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/esphome/components/sm10bit_base/sm10bit_base.cpp b/esphome/components/sm10bit_base/sm10bit_base.cpp
index 9c7abb48e2..d380f31c6f 100644
--- a/esphome/components/sm10bit_base/sm10bit_base.cpp
+++ b/esphome/components/sm10bit_base/sm10bit_base.cpp
@@ -11,6 +11,8 @@ static const uint8_t SM10BIT_ADDR_START_3CH = 0x8;
 static const uint8_t SM10BIT_ADDR_START_2CH = 0x10;
 static const uint8_t SM10BIT_ADDR_START_5CH = 0x18;
 
+static const uint8_t SM10BIT_DELAY = 2;
+
 // Power current values
 // HEX | Binary | RGB level | White level | Config value
 // 0x0 | 0000   | RGB 10mA  | CW 5mA      | 0
@@ -37,10 +39,13 @@ void Sm10BitBase::loop() {
   uint8_t data[12];
   if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
       this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Off / Sleep
-    data[0] = this->model_id_ + SM10BIT_ADDR_STANDBY;
     for (int i = 1; i < 12; i++)
       data[i] = 0;
+    // First turn all channels off
+    data[0] = this->model_id_ + SM10BIT_ADDR_START_5CH;
+    this->write_buffer_(data, 12);
+    // Then sleep
+    data[0] = this->model_id_ + SM10BIT_ADDR_STANDBY;
     this->write_buffer_(data, 12);
   } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
              (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {
@@ -84,28 +89,42 @@ void Sm10BitBase::set_channel_value_(uint8_t channel, uint16_t value) {
   this->pwm_amounts_[channel] = value;
 }
 void Sm10BitBase::write_bit_(bool value) {
-  this->clock_pin_->digital_write(false);
   this->data_pin_->digital_write(value);
+  delayMicroseconds(SM10BIT_DELAY);
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(SM10BIT_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(SM10BIT_DELAY);
 }
 
 void Sm10BitBase::write_byte_(uint8_t data) {
   for (uint8_t mask = 0x80; mask; mask >>= 1) {
     this->write_bit_(data & mask);
   }
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(true);
+
+  // ack bit
+  this->data_pin_->pin_mode(gpio::FLAG_INPUT);
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(SM10BIT_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(SM10BIT_DELAY);
+  this->data_pin_->pin_mode(gpio::FLAG_OUTPUT);
 }
 
 void Sm10BitBase::write_buffer_(uint8_t *buffer, uint8_t size) {
   this->data_pin_->digital_write(false);
+  delayMicroseconds(SM10BIT_DELAY);
+  this->clock_pin_->digital_write(false);
+  delayMicroseconds(SM10BIT_DELAY);
+
   for (uint32_t i = 0; i < size; i++) {
     this->write_byte_(buffer[i]);
   }
-  this->clock_pin_->digital_write(false);
+
   this->clock_pin_->digital_write(true);
+  delayMicroseconds(SM10BIT_DELAY);
   this->data_pin_->digital_write(true);
+  delayMicroseconds(SM10BIT_DELAY);
 }
 
 }  // namespace sm10bit_base

From da3e3903ddb36f5a5c3161bf6e23c8eadfdcfbbe Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 12 Oct 2023 18:51:28 -0500
Subject: [PATCH 006/131] BP1658CJ - Clear all channels before sleeping.
 (#5525)

---
 esphome/components/bp1658cj/bp1658cj.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/esphome/components/bp1658cj/bp1658cj.cpp b/esphome/components/bp1658cj/bp1658cj.cpp
index d3f3e71fed..05c3f790c2 100644
--- a/esphome/components/bp1658cj/bp1658cj.cpp
+++ b/esphome/components/bp1658cj/bp1658cj.cpp
@@ -37,10 +37,14 @@ void BP1658CJ::loop() {
   uint8_t data[12];
   if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
       this->pwm_amounts_[3] == 0 && this->pwm_amounts_[4] == 0) {
-    // Off / Sleep
-    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
     for (int i = 1; i < 12; i++)
       data[i] = 0;
+
+    // First turn all channels off
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_START_5CH;
+    this->write_buffer_(data, 12);
+    // Then sleep
+    data[0] = BP1658CJ_MODEL_ID + BP1658CJ_ADDR_STANDBY;
     this->write_buffer_(data, 12);
   } else if (this->pwm_amounts_[0] == 0 && this->pwm_amounts_[1] == 0 && this->pwm_amounts_[2] == 0 &&
              (this->pwm_amounts_[3] > 0 || this->pwm_amounts_[4] > 0)) {

From 7ddcdab35130ab54ba4735623df2aab95dcf3ce6 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Sat, 14 Oct 2023 13:07:23 +1300
Subject: [PATCH 007/131] Add round sensor filter (#5532)

---
 esphome/components/sensor/__init__.py | 18 ++++++++++++++++++
 esphome/components/sensor/filter.cpp  |  9 +++++++++
 esphome/components/sensor/filter.h    |  9 +++++++++
 3 files changed, 36 insertions(+)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index ee42011038..bd7306ac28 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -242,6 +242,7 @@ CalibrateLinearFilter = sensor_ns.class_("CalibrateLinearFilter", Filter)
 CalibratePolynomialFilter = sensor_ns.class_("CalibratePolynomialFilter", Filter)
 SensorInRangeCondition = sensor_ns.class_("SensorInRangeCondition", Filter)
 ClampFilter = sensor_ns.class_("ClampFilter", Filter)
+RoundFilter = sensor_ns.class_("RoundFilter", Filter)
 
 validate_unit_of_measurement = cv.string_strict
 validate_accuracy_decimals = cv.int_
@@ -702,6 +703,23 @@ async def clamp_filter_to_code(config, filter_id):
     )
 
 
+@FILTER_REGISTRY.register(
+    "round",
+    RoundFilter,
+    cv.maybe_simple_value(
+        {
+            cv.Required(CONF_ACCURACY_DECIMALS): cv.uint8_t,
+        },
+        key=CONF_ACCURACY_DECIMALS,
+    ),
+)
+async def round_filter_to_code(config, filter_id):
+    return cg.new_Pvariable(
+        filter_id,
+        config[CONF_ACCURACY_DECIMALS],
+    )
+
+
 async def build_filters(config):
     return await cg.build_registry_list(FILTER_REGISTRY, config)
 
diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index 6323023d50..af67a60754 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -445,5 +445,14 @@ optional<float> ClampFilter::new_value(float value) {
   return value;
 }
 
+RoundFilter::RoundFilter(uint8_t precision) : precision_(precision) {}
+optional<float> RoundFilter::new_value(float value) {
+  if (std::isfinite(value)) {
+    float accuracy_mult = powf(10.0f, this->precision_);
+    return roundf(accuracy_mult * value) / accuracy_mult;
+  }
+  return value;
+}
+
 }  // namespace sensor
 }  // namespace esphome
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index 46aeefac56..d4239837b6 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -419,5 +419,14 @@ class ClampFilter : public Filter {
   float max_{NAN};
 };
 
+class RoundFilter : public Filter {
+ public:
+  explicit RoundFilter(uint8_t precision);
+  optional<float> new_value(float value) override;
+
+ protected:
+  uint8_t precision_;
+};
+
 }  // namespace sensor
 }  // namespace esphome

From 6143099f60d1c76e3faa0da3e75cb3fd25e5ebf1 Mon Sep 17 00:00:00 2001
From: ghsensdev <145111396+ghsensdev@users.noreply.github.com>
Date: Sun, 15 Oct 2023 20:49:57 +0200
Subject: [PATCH 008/131] Add Support for Sensirion SFA30 sensor (#5519)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                           |  1 +
 esphome/components/sfa30/__init__.py |  1 +
 esphome/components/sfa30/sensor.py   | 78 ++++++++++++++++++++++
 esphome/components/sfa30/sfa30.cpp   | 99 ++++++++++++++++++++++++++++
 esphome/components/sfa30/sfa30.h     | 34 ++++++++++
 tests/test1.yaml                     | 10 +++
 6 files changed, 223 insertions(+)
 create mode 100644 esphome/components/sfa30/__init__.py
 create mode 100644 esphome/components/sfa30/sensor.py
 create mode 100644 esphome/components/sfa30/sfa30.cpp
 create mode 100644 esphome/components/sfa30/sfa30.h

diff --git a/CODEOWNERS b/CODEOWNERS
index d7cf7269ab..326642e12c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -254,6 +254,7 @@ esphome/components/sen21231/* @shreyaskarnik
 esphome/components/sen5x/* @martgras
 esphome/components/sensirion_common/* @martgras
 esphome/components/sensor/* @esphome/core
+esphome/components/sfa30/* @ghsensdev
 esphome/components/sgp40/* @SenexCrenshaw
 esphome/components/sgp4x/* @SenexCrenshaw @martgras
 esphome/components/shelly_dimmer/* @edge90 @rnauber
diff --git a/esphome/components/sfa30/__init__.py b/esphome/components/sfa30/__init__.py
new file mode 100644
index 0000000000..28b665906f
--- /dev/null
+++ b/esphome/components/sfa30/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@ghsensdev"]
diff --git a/esphome/components/sfa30/sensor.py b/esphome/components/sfa30/sensor.py
new file mode 100644
index 0000000000..428f6b874b
--- /dev/null
+++ b/esphome/components/sfa30/sensor.py
@@ -0,0 +1,78 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor, sensirion_common
+
+from esphome.const import (
+    CONF_ID,
+    CONF_FORMALDEHYDE,
+    CONF_HUMIDITY,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_GAS,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_TEMPERATURE,
+    ICON_RADIATOR,
+    ICON_WATER_PERCENT,
+    ICON_THERMOMETER,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_PARTS_PER_BILLION,
+    UNIT_PERCENT,
+    UNIT_CELSIUS,
+)
+
+CODEOWNERS = ["@ghsensdev"]
+DEPENDENCIES = ["i2c"]
+AUTO_LOAD = ["sensirion_common"]
+
+sfa30_ns = cg.esphome_ns.namespace("sfa30")
+
+SFA30Component = sfa30_ns.class_(
+    "SFA30Component", cg.PollingComponent, sensirion_common.SensirionI2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(SFA30Component),
+            cv.Optional(CONF_FORMALDEHYDE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_BILLION,
+                icon=ICON_RADIATOR,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_GAS,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_HUMIDITY): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PERCENT,
+                icon=ICON_WATER_PERCENT,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_HUMIDITY,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                icon=ICON_THERMOMETER,
+                accuracy_decimals=2,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x5D))
+)
+
+SENSOR_MAP = {
+    CONF_FORMALDEHYDE: "set_formaldehyde_sensor",
+    CONF_HUMIDITY: "set_humidity_sensor",
+    CONF_TEMPERATURE: "set_temperature_sensor",
+}
+
+
+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)
+
+    for key, funcName in SENSOR_MAP.items():
+        if sensor_config := config.get(key):
+            sens = await sensor.new_sensor(sensor_config)
+            cg.add(getattr(var, funcName)(sens))
diff --git a/esphome/components/sfa30/sfa30.cpp b/esphome/components/sfa30/sfa30.cpp
new file mode 100644
index 0000000000..20d5ddad5e
--- /dev/null
+++ b/esphome/components/sfa30/sfa30.cpp
@@ -0,0 +1,99 @@
+#include "sfa30.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace sfa30 {
+
+static const char *const TAG = "sfa30";
+
+static const uint16_t SFA30_CMD_GET_DEVICE_MARKING = 0xD060;
+static const uint16_t SFA30_CMD_START_CONTINUOUS_MEASUREMENTS = 0x0006;
+static const uint16_t SFA30_CMD_READ_MEASUREMENT = 0x0327;
+
+void SFA30Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up sfa30...");
+
+  // Serial Number identification
+  uint16_t raw_device_marking[16];
+  if (!this->get_register(SFA30_CMD_GET_DEVICE_MARKING, raw_device_marking, 16, 5)) {
+    ESP_LOGE(TAG, "Failed to read device marking");
+    this->error_code_ = DEVICE_MARKING_READ_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  for (size_t i = 0; i < 16; i++) {
+    this->device_marking_[i * 2] = static_cast<char>(raw_device_marking[i] >> 8);
+    this->device_marking_[i * 2 + 1] = static_cast<char>(raw_device_marking[i] & 0xFF);
+  }
+  ESP_LOGD(TAG, "Device Marking: '%s'", this->device_marking_);
+
+  if (!this->write_command(SFA30_CMD_START_CONTINUOUS_MEASUREMENTS)) {
+    ESP_LOGE(TAG, "Error starting measurements.");
+    this->error_code_ = MEASUREMENT_INIT_FAILED;
+    this->mark_failed();
+    return;
+  }
+
+  ESP_LOGD(TAG, "Sensor initialized");
+}
+
+void SFA30Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "sfa30:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    switch (this->error_code_) {
+      case DEVICE_MARKING_READ_FAILED:
+        ESP_LOGW(TAG, "Unable to read device marking!");
+        break;
+      case MEASUREMENT_INIT_FAILED:
+        ESP_LOGW(TAG, "Measurement initialization failed!");
+        break;
+      default:
+        ESP_LOGW(TAG, "Unknown setup error!");
+        break;
+    }
+  }
+  LOG_UPDATE_INTERVAL(this);
+  ESP_LOGCONFIG(TAG, "  Device Marking: '%s'", this->device_marking_);
+  LOG_SENSOR("  ", "Formaldehyde", this->formaldehyde_sensor_);
+  LOG_SENSOR("  ", "Humidity", this->humidity_sensor_);
+  LOG_SENSOR("  ", "Temperature", this->temperature_sensor_);
+}
+
+void SFA30Component::update() {
+  if (!this->write_command(SFA30_CMD_READ_MEASUREMENT)) {
+    ESP_LOGW(TAG, "Error reading measurement!");
+    this->status_set_warning();
+    return;
+  }
+
+  this->set_timeout(5, [this]() {
+    uint16_t raw_data[3];
+    if (!this->read_data(raw_data, 3)) {
+      ESP_LOGW(TAG, "Error reading measurement data!");
+      this->status_set_warning();
+      return;
+    }
+
+    if (this->formaldehyde_sensor_ != nullptr) {
+      const float formaldehyde = raw_data[0] / 5.0f;
+      this->formaldehyde_sensor_->publish_state(formaldehyde);
+    }
+
+    if (this->humidity_sensor_ != nullptr) {
+      const float humidity = raw_data[1] / 100.0f;
+      this->humidity_sensor_->publish_state(humidity);
+    }
+
+    if (this->temperature_sensor_ != nullptr) {
+      const float temperature = raw_data[2] / 200.0f;
+      this->temperature_sensor_->publish_state(temperature);
+    }
+
+    this->status_clear_warning();
+  });
+}
+
+}  // namespace sfa30
+}  // namespace esphome
diff --git a/esphome/components/sfa30/sfa30.h b/esphome/components/sfa30/sfa30.h
new file mode 100644
index 0000000000..fa2c59f624
--- /dev/null
+++ b/esphome/components/sfa30/sfa30.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/sensirion_common/i2c_sensirion.h"
+
+namespace esphome {
+namespace sfa30 {
+
+class SFA30Component : public PollingComponent, public sensirion_common::SensirionI2CDevice {
+  enum ErrorCode { DEVICE_MARKING_READ_FAILED, MEASUREMENT_INIT_FAILED, UNKNOWN };
+
+ public:
+  float get_setup_priority() const override { return setup_priority::DATA; }
+  void setup() override;
+  void dump_config() override;
+  void update() override;
+
+  void set_formaldehyde_sensor(sensor::Sensor *formaldehyde) { this->formaldehyde_sensor_ = formaldehyde; }
+  void set_humidity_sensor(sensor::Sensor *humidity) { this->humidity_sensor_ = humidity; }
+  void set_temperature_sensor(sensor::Sensor *temperature) { this->temperature_sensor_ = temperature; }
+
+ protected:
+  char device_marking_[32] = {0};
+
+  ErrorCode error_code_{UNKNOWN};
+
+  sensor::Sensor *formaldehyde_sensor_{nullptr};
+  sensor::Sensor *humidity_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
+};
+
+}  // namespace sfa30
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 6d42e325d8..b9b4beb5ad 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1083,6 +1083,16 @@ sensor:
     ambient_pressure_compensation: 961mBar
     temperature_offset: 4.2C
     i2c_id: i2c_bus
+  - platform: sfa30
+    formaldehyde:
+      name: "SFA30 formaldehyde"
+    temperature:
+      name: "SFA30 temperature"
+    humidity:
+      name: "SFA30 humidity"
+    i2c_id: i2c_bus
+    address: 0x5D
+    update_interval: 30s
   - platform: sen0321
     name: Workshop Ozone Sensor
     id: sen0321_ozone

From 357ba1ab0f08ee0a0653a3cde8db246f5c10447f Mon Sep 17 00:00:00 2001
From: leoshusar <husar.leos@outlook.com>
Date: Mon, 16 Oct 2023 00:29:13 +0200
Subject: [PATCH 009/131] Change UART source clock to `UART_SCLK_DEFAULT` when
 IDF >=v5 (#5533)

---
 esphome/components/uart/uart_component_esp_idf.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/uart/uart_component_esp_idf.cpp b/esphome/components/uart/uart_component_esp_idf.cpp
index ae772fa8f8..9b519c4568 100644
--- a/esphome/components/uart/uart_component_esp_idf.cpp
+++ b/esphome/components/uart/uart_component_esp_idf.cpp
@@ -48,7 +48,11 @@ uart_config_t IDFUARTComponent::get_config_() {
   uart_config.parity = parity;
   uart_config.stop_bits = this->stop_bits_ == 1 ? UART_STOP_BITS_1 : UART_STOP_BITS_2;
   uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+  uart_config.source_clk = UART_SCLK_DEFAULT;
+#else
   uart_config.source_clk = UART_SCLK_APB;
+#endif
   uart_config.rx_flow_ctrl_thresh = 122;
 
   return uart_config;

From 06eff72065c1510a4d4e7a5707adff70f243911f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 16 Oct 2023 19:41:59 +1300
Subject: [PATCH 010/131] Prometheus fix for esp-idf and fix newlines (#5536)

---
 .../prometheus/prometheus_handler.cpp         | 22 ++++++++-----------
 .../prometheus/prometheus_handler.h           |  8 ++-----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/esphome/components/prometheus/prometheus_handler.cpp b/esphome/components/prometheus/prometheus_handler.cpp
index abb5111aaf..68bca95a21 100644
--- a/esphome/components/prometheus/prometheus_handler.cpp
+++ b/esphome/components/prometheus/prometheus_handler.cpp
@@ -1,5 +1,3 @@
-#ifdef USE_ARDUINO
-
 #include "prometheus_handler.h"
 #include "esphome/core/application.h"
 
@@ -89,7 +87,7 @@ void PrometheusHandler::sensor_row_(AsyncResponseStream *stream, sensor::Sensor
     stream->print(obj->get_unit_of_measurement().c_str());
     stream->print(F("\"} "));
     stream->print(value_accuracy_to_string(obj->state, obj->get_accuracy_decimals()).c_str());
-    stream->print('\n');
+    stream->print(F("\n"));
   } else {
     // Invalid state
     stream->print(F("esphome_sensor_failed{id=\""));
@@ -124,7 +122,7 @@ void PrometheusHandler::binary_sensor_row_(AsyncResponseStream *stream, binary_s
     stream->print(relabel_name_(obj).c_str());
     stream->print(F("\"} "));
     stream->print(obj->state);
-    stream->print('\n');
+    stream->print(F("\n"));
   } else {
     // Invalid state
     stream->print(F("esphome_binary_sensor_failed{id=\""));
@@ -158,7 +156,7 @@ void PrometheusHandler::fan_row_(AsyncResponseStream *stream, fan::Fan *obj) {
   stream->print(relabel_name_(obj).c_str());
   stream->print(F("\"} "));
   stream->print(obj->state);
-  stream->print('\n');
+  stream->print(F("\n"));
   // Speed if available
   if (obj->get_traits().supports_speed()) {
     stream->print(F("esphome_fan_speed{id=\""));
@@ -167,7 +165,7 @@ void PrometheusHandler::fan_row_(AsyncResponseStream *stream, fan::Fan *obj) {
     stream->print(relabel_name_(obj).c_str());
     stream->print(F("\"} "));
     stream->print(obj->speed);
-    stream->print('\n');
+    stream->print(F("\n"));
   }
   // Oscillation if available
   if (obj->get_traits().supports_oscillation()) {
@@ -177,7 +175,7 @@ void PrometheusHandler::fan_row_(AsyncResponseStream *stream, fan::Fan *obj) {
     stream->print(relabel_name_(obj).c_str());
     stream->print(F("\"} "));
     stream->print(obj->oscillating);
-    stream->print('\n');
+    stream->print(F("\n"));
   }
 }
 #endif
@@ -281,7 +279,7 @@ void PrometheusHandler::cover_row_(AsyncResponseStream *stream, cover::Cover *ob
     stream->print(relabel_name_(obj).c_str());
     stream->print(F("\"} "));
     stream->print(obj->position);
-    stream->print('\n');
+    stream->print(F("\n"));
     if (obj->get_traits().get_supports_tilt()) {
       stream->print(F("esphome_cover_tilt{id=\""));
       stream->print(relabel_id_(obj).c_str());
@@ -289,7 +287,7 @@ void PrometheusHandler::cover_row_(AsyncResponseStream *stream, cover::Cover *ob
       stream->print(relabel_name_(obj).c_str());
       stream->print(F("\"} "));
       stream->print(obj->tilt);
-      stream->print('\n');
+      stream->print(F("\n"));
     }
   } else {
     // Invalid state
@@ -322,7 +320,7 @@ void PrometheusHandler::switch_row_(AsyncResponseStream *stream, switch_::Switch
   stream->print(relabel_name_(obj).c_str());
   stream->print(F("\"} "));
   stream->print(obj->state);
-  stream->print('\n');
+  stream->print(F("\n"));
 }
 #endif
 
@@ -346,11 +344,9 @@ void PrometheusHandler::lock_row_(AsyncResponseStream *stream, lock::Lock *obj)
   stream->print(relabel_name_(obj).c_str());
   stream->print(F("\"} "));
   stream->print(obj->state);
-  stream->print('\n');
+  stream->print(F("\n"));
 }
 #endif
 
 }  // namespace prometheus
 }  // namespace esphome
-
-#endif  // USE_ARDUINO
diff --git a/esphome/components/prometheus/prometheus_handler.h b/esphome/components/prometheus/prometheus_handler.h
index 0ae2856ce4..a9505a3572 100644
--- a/esphome/components/prometheus/prometheus_handler.h
+++ b/esphome/components/prometheus/prometheus_handler.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#ifdef USE_ARDUINO
-
 #include <map>
 #include <utility>
 
-#include "esphome/core/entity_base.h"
 #include "esphome/components/web_server_base/web_server_base.h"
-#include "esphome/core/controller.h"
 #include "esphome/core/component.h"
+#include "esphome/core/controller.h"
+#include "esphome/core/entity_base.h"
 
 namespace esphome {
 namespace prometheus {
@@ -119,5 +117,3 @@ class PrometheusHandler : public AsyncWebHandler, public Component {
 
 }  // namespace prometheus
 }  // namespace esphome
-
-#endif  // USE_ARDUINO

From 26f12cd3bbed34df0a4829e999f378e37afc8902 Mon Sep 17 00:00:00 2001
From: raineth <github@t.themuffin.net>
Date: Mon, 16 Oct 2023 02:42:18 -0400
Subject: [PATCH 011/131] Make IPAddress's operator!= compare values, not
 memory addresses. (#5537)

Co-authored-by: Ben Winslow <rain@bluecherry.net>
---
 esphome/components/network/ip_address.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index 8b05237c05..7a4d394805 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -87,7 +87,7 @@ struct IPAddress {
   bool is_ip6() { return IP_IS_V6(&ip_addr_); }
   std::string str() const { return ipaddr_ntoa(&ip_addr_); }
   bool operator==(const IPAddress &other) const { return ip_addr_cmp(&ip_addr_, &other.ip_addr_); }
-  bool operator!=(const IPAddress &other) const { return !(&ip_addr_ == &other.ip_addr_); }
+  bool operator!=(const IPAddress &other) const { return !ip_addr_cmp(&ip_addr_, &other.ip_addr_); }
   IPAddress &operator+=(uint8_t increase) {
     if (IP_IS_V4(&ip_addr_)) {
 #if LWIP_IPV6

From e42c51a222abb817d5dfba00cc7cd34d8b7c8fca Mon Sep 17 00:00:00 2001
From: Christian <max246@gmail.com>
Date: Mon, 16 Oct 2023 20:47:35 +0100
Subject: [PATCH 012/131] Add change i2c address and allow multi conf for
 TB6612FNG (#5492)

---
 .../components/grove_tb6612fng/__init__.py    | 25 +++++++++++++++++++
 .../grove_tb6612fng/grove_tb6612fng.h         | 11 ++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/esphome/components/grove_tb6612fng/__init__.py b/esphome/components/grove_tb6612fng/__init__.py
index 75610ce9d3..7db0198a89 100644
--- a/esphome/components/grove_tb6612fng/__init__.py
+++ b/esphome/components/grove_tb6612fng/__init__.py
@@ -8,12 +8,15 @@ from esphome.const import (
     CONF_CHANNEL,
     CONF_SPEED,
     CONF_DIRECTION,
+    CONF_ADDRESS,
 )
 
 DEPENDENCIES = ["i2c"]
 
 CODEOWNERS = ["@max246"]
 
+MULTI_CONF = True
+
 grove_tb6612fng_ns = cg.esphome_ns.namespace("grove_tb6612fng")
 GROVE_TB6612FNG = grove_tb6612fng_ns.class_(
     "GroveMotorDriveTB6612FNG", cg.Component, i2c.I2CDevice
@@ -33,6 +36,9 @@ GROVETB6612FNGMotorStandbyAction = grove_tb6612fng_ns.class_(
 GROVETB6612FNGMotorNoStandbyAction = grove_tb6612fng_ns.class_(
     "GROVETB6612FNGMotorNoStandbyAction", automation.Action
 )
+GROVETB6612FNGMotorChangeAddressAction = grove_tb6612fng_ns.class_(
+    "GROVETB6612FNGMotorChangeAddressAction", automation.Action
+)
 
 DIRECTION_TYPE = {
     "FORWARD": 1,
@@ -150,3 +156,22 @@ async def grove_tb6612fng_no_standby_to_code(config, action_id, template_arg, ar
     await cg.register_parented(var, config[CONF_ID])
 
     return var
+
+
+@automation.register_action(
+    "grove_tb6612fng.change_address",
+    GROVETB6612FNGMotorChangeAddressAction,
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.use_id(GROVE_TB6612FNG),
+            cv.Required(CONF_ADDRESS): cv.i2c_address,
+        }
+    ),
+)
+async def grove_tb6612fng_change_address_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+
+    template_channel = await cg.templatable(config[CONF_ADDRESS], args, int)
+    cg.add(var.set_address(template_channel))
+    return var
diff --git a/esphome/components/grove_tb6612fng/grove_tb6612fng.h b/esphome/components/grove_tb6612fng/grove_tb6612fng.h
index ccdab6472a..2743ef4ed7 100644
--- a/esphome/components/grove_tb6612fng/grove_tb6612fng.h
+++ b/esphome/components/grove_tb6612fng/grove_tb6612fng.h
@@ -84,8 +84,7 @@ class GroveMotorDriveTB6612FNG : public Component, public i2c::I2CDevice {
   *************************************************************/
   void set_i2c_addr(uint8_t addr);
 
-  /*************************************************************
-      Description
+  /***********************************change_address
        Drive a motor.
       Parameter
        chl: MOTOR_CHA or MOTOR_CHB
@@ -204,5 +203,13 @@ class GROVETB6612FNGMotorNoStandbyAction : public Action<Ts...>, public Parented
   void play(Ts... x) override { this->parent_->not_standby(); }
 };
 
+template<typename... Ts>
+class GROVETB6612FNGMotorChangeAddressAction : public Action<Ts...>, public Parented<GroveMotorDriveTB6612FNG> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, address)
+
+  void play(Ts... x) override { this->parent_->set_i2c_addr(this->address_.value(x...)); }
+};
+
 }  // namespace grove_tb6612fng
 }  // namespace esphome

From 4913b3cc356a996a548ea9ed8d61d11d172b5e8f Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 17 Oct 2023 17:18:05 +1300
Subject: [PATCH 013/131] Add stream start and end events (#5545)

---
 esphome/components/api/api.proto              |  2 +
 esphome/components/api/api_pb2.cpp            |  4 ++
 esphome/components/api/api_pb2.h              |  2 +
 .../i2s_audio/speaker/i2s_audio_speaker.cpp   |  6 ++
 .../voice_assistant/voice_assistant.cpp       | 69 +++++++++++++++++--
 .../voice_assistant/voice_assistant.h         |  3 +-
 6 files changed, 81 insertions(+), 5 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index ec4a0f7cc9..69765c7a94 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -1459,6 +1459,8 @@ enum VoiceAssistantEvent {
   VOICE_ASSISTANT_WAKE_WORD_END = 10;
   VOICE_ASSISTANT_STT_VAD_START = 11;
   VOICE_ASSISTANT_STT_VAD_END = 12;
+  VOICE_ASSISTANT_TTS_STREAM_START = 98;
+  VOICE_ASSISTANT_TTS_STREAM_END = 99;
 }
 
 message VoiceAssistantEventData {
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 225b213a67..65df2312e1 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -452,6 +452,10 @@ template<> const char *proto_enum_to_string<enums::VoiceAssistantEvent>(enums::V
       return "VOICE_ASSISTANT_STT_VAD_START";
     case enums::VOICE_ASSISTANT_STT_VAD_END:
       return "VOICE_ASSISTANT_STT_VAD_END";
+    case enums::VOICE_ASSISTANT_TTS_STREAM_START:
+      return "VOICE_ASSISTANT_TTS_STREAM_START";
+    case enums::VOICE_ASSISTANT_TTS_STREAM_END:
+      return "VOICE_ASSISTANT_TTS_STREAM_END";
     default:
       return "UNKNOWN";
   }
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index a4826f09d2..4c70facf3d 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -184,6 +184,8 @@ enum VoiceAssistantEvent : uint32_t {
   VOICE_ASSISTANT_WAKE_WORD_END = 10,
   VOICE_ASSISTANT_STT_VAD_START = 11,
   VOICE_ASSISTANT_STT_VAD_END = 12,
+  VOICE_ASSISTANT_TTS_STREAM_START = 98,
+  VOICE_ASSISTANT_TTS_STREAM_END = 99,
 };
 enum AlarmControlPanelState : uint32_t {
   ALARM_STATE_DISARMED = 0,
diff --git a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
index 592a27b739..ed13e6b458 100644
--- a/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
+++ b/esphome/components/i2s_audio/speaker/i2s_audio_speaker.cpp
@@ -158,8 +158,13 @@ void I2SAudioSpeaker::watch_() {
   if (xQueueReceive(this->event_queue_, &event, 0) == pdTRUE) {
     switch (event.type) {
       case TaskEventType::STARTING:
+        ESP_LOGD(TAG, "Starting I2S Audio Speaker");
+        break;
       case TaskEventType::STARTED:
+        ESP_LOGD(TAG, "Started I2S Audio Speaker");
+        break;
       case TaskEventType::STOPPING:
+        ESP_LOGD(TAG, "Stopping I2S Audio Speaker");
         break;
       case TaskEventType::PLAYING:
         this->status_clear_warning();
@@ -170,6 +175,7 @@ void I2SAudioSpeaker::watch_() {
         this->player_task_handle_ = nullptr;
         this->parent_->unlock();
         xQueueReset(this->buffer_queue_);
+        ESP_LOGD(TAG, "Stopped I2S Audio Speaker");
         break;
       case TaskEventType::WARNING:
         ESP_LOGW(TAG, "Error writing to I2S: %s", esp_err_to_name(event.err));
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 448df61d80..12fbdc97b4 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -281,11 +281,14 @@ void VoiceAssistant::loop() {
             memmove(this->speaker_buffer_, this->speaker_buffer_ + written, this->speaker_buffer_size_ - written);
             this->speaker_buffer_size_ -= written;
             this->speaker_buffer_index_ -= written;
-            this->set_timeout("speaker-timeout", 1000, [this]() { this->speaker_->stop(); });
+            this->set_timeout("speaker-timeout", 2000, [this]() { this->speaker_->stop(); });
           } else {
             ESP_LOGW(TAG, "Speaker buffer full.");
           }
         }
+        if (this->wait_for_stream_end_) {
+          break;  // We dont want to timeout here as the STREAM_END event will take care of that.
+        }
         playing = this->speaker_->is_running();
       }
 #endif
@@ -295,28 +298,77 @@ void VoiceAssistant::loop() {
       }
 #endif
       if (playing) {
-        this->set_timeout("playing", 100, [this]() {
+        this->set_timeout("playing", 2000, [this]() {
           this->cancel_timeout("speaker-timeout");
           this->set_state_(State::IDLE, State::IDLE);
         });
       }
       break;
     }
+    case State::RESPONSE_FINISHED: {
+#ifdef USE_SPEAKER
+      if (this->speaker_ != nullptr) {
+        this->speaker_->stop();
+        this->cancel_timeout("speaker-timeout");
+        this->cancel_timeout("playing");
+        this->speaker_buffer_size_ = 0;
+        this->speaker_buffer_index_ = 0;
+        memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
+      }
+#endif
+      this->wait_for_stream_end_ = false;
+      this->set_state_(State::IDLE, State::IDLE);
+      break;
+    }
     default:
       break;
   }
 }
 
+static const LogString *voice_assistant_state_to_string(State state) {
+  switch (state) {
+    case State::IDLE:
+      return LOG_STR("IDLE");
+    case State::START_MICROPHONE:
+      return LOG_STR("START_MICROPHONE");
+    case State::STARTING_MICROPHONE:
+      return LOG_STR("STARTING_MICROPHONE");
+    case State::WAIT_FOR_VAD:
+      return LOG_STR("WAIT_FOR_VAD");
+    case State::WAITING_FOR_VAD:
+      return LOG_STR("WAITING_FOR_VAD");
+    case State::START_PIPELINE:
+      return LOG_STR("START_PIPELINE");
+    case State::STARTING_PIPELINE:
+      return LOG_STR("STARTING_PIPELINE");
+    case State::STREAMING_MICROPHONE:
+      return LOG_STR("STREAMING_MICROPHONE");
+    case State::STOP_MICROPHONE:
+      return LOG_STR("STOP_MICROPHONE");
+    case State::STOPPING_MICROPHONE:
+      return LOG_STR("STOPPING_MICROPHONE");
+    case State::AWAITING_RESPONSE:
+      return LOG_STR("AWAITING_RESPONSE");
+    case State::STREAMING_RESPONSE:
+      return LOG_STR("STREAMING_RESPONSE");
+    case State::RESPONSE_FINISHED:
+      return LOG_STR("RESPONSE_FINISHED");
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+};
+
 void VoiceAssistant::set_state_(State state) {
   State old_state = this->state_;
   this->state_ = state;
-  ESP_LOGD(TAG, "State changed from %d to %d", static_cast<uint8_t>(old_state), static_cast<uint8_t>(state));
+  ESP_LOGD(TAG, "State changed from %s to %s", LOG_STR_ARG(voice_assistant_state_to_string(old_state)),
+           LOG_STR_ARG(voice_assistant_state_to_string(state)));
 }
 
 void VoiceAssistant::set_state_(State state, State desired_state) {
   this->set_state_(state);
   this->desired_state_ = desired_state;
-  ESP_LOGD(TAG, "Desired state set to %d", static_cast<uint8_t>(desired_state));
+  ESP_LOGD(TAG, "Desired state set to %s", LOG_STR_ARG(voice_assistant_state_to_string(desired_state)));
 }
 
 void VoiceAssistant::failed_to_start() {
@@ -400,6 +452,7 @@ void VoiceAssistant::request_stop() {
       break;
     case State::AWAITING_RESPONSE:
     case State::STREAMING_RESPONSE:
+    case State::RESPONSE_FINISHED:
       break;  // Let the incoming audio stream finish then it will go to idle.
   }
 }
@@ -531,6 +584,14 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
       this->error_trigger_->trigger(code, message);
       break;
     }
+    case api::enums::VOICE_ASSISTANT_TTS_STREAM_START: {
+      this->wait_for_stream_end_ = true;
+      break;
+    }
+    case api::enums::VOICE_ASSISTANT_TTS_STREAM_END: {
+      this->set_state_(State::RESPONSE_FINISHED, State::IDLE);
+      break;
+    }
     default:
       ESP_LOGD(TAG, "Unhandled event type: %d", msg.event_type);
       break;
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index ce22538a85..cd448293db 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -46,6 +46,7 @@ enum class State {
   STOPPING_MICROPHONE,
   AWAITING_RESPONSE,
   STREAMING_RESPONSE,
+  RESPONSE_FINISHED,
 };
 
 class VoiceAssistant : public Component {
@@ -132,10 +133,10 @@ class VoiceAssistant : public Component {
   uint8_t *speaker_buffer_;
   size_t speaker_buffer_index_{0};
   size_t speaker_buffer_size_{0};
+  bool wait_for_stream_end_{false};
 #endif
 #ifdef USE_MEDIA_PLAYER
   media_player::MediaPlayer *media_player_{nullptr};
-  bool playing_tts_{false};
 #endif
 
   bool local_output_{false};

From fb90e197132a1dc8c23fe7cbbef83fcb18fbfab8 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 17 Oct 2023 20:03:39 +1300
Subject: [PATCH 014/131] Fix esp32_improv authorizer with no binary sensors in
 config (#5546)

---
 esphome/components/esp32_improv/esp32_improv_component.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 5bdf7d19fe..8a901a79e5 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -107,6 +107,7 @@ void ESP32ImprovComponent::loop() {
       break;
     }
     case improv::STATE_AUTHORIZED: {
+#ifdef USE_BINARY_SENSOR
       if (this->authorizer_ != nullptr) {
         if (now - this->authorized_start_ > this->authorized_duration_) {
           ESP_LOGD(TAG, "Authorization timeout");
@@ -114,6 +115,7 @@ void ESP32ImprovComponent::loop() {
           return;
         }
       }
+#endif
       if (!this->check_identify_()) {
         this->set_status_indicator_state_((now % 1000) < 500);
       }
@@ -290,8 +292,10 @@ void ESP32ImprovComponent::process_incoming_data_() {
 void ESP32ImprovComponent::on_wifi_connect_timeout_() {
   this->set_error_(improv::ERROR_UNABLE_TO_CONNECT);
   this->set_state_(improv::STATE_AUTHORIZED);
+#ifdef USE_BINARY_SENSOR
   if (this->authorizer_ != nullptr)
     this->authorized_start_ = millis();
+#endif
   ESP_LOGW(TAG, "Timed out trying to connect to given WiFi network");
   wifi::global_wifi_component->clear_sta();
 }

From a960c8008ea3f15888b2388a08bf6308995ac278 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 17 Oct 2023 20:11:37 +1300
Subject: [PATCH 015/131] More voice assistant fixes (#5547)

---
 .../components/i2s_audio/microphone/i2s_audio_microphone.cpp    | 2 ++
 esphome/components/voice_assistant/voice_assistant.cpp          | 1 +
 2 files changed, 3 insertions(+)

diff --git a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
index 44c73eb8fd..ec2fe258c9 100644
--- a/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
+++ b/esphome/components/i2s_audio/microphone/i2s_audio_microphone.cpp
@@ -37,6 +37,8 @@ void I2SAudioMicrophone::setup() {
 void I2SAudioMicrophone::start() {
   if (this->is_failed())
     return;
+  if (this->state_ == microphone::STATE_RUNNING)
+    return;  // Already running
   this->state_ = microphone::STATE_STARTING;
 }
 void I2SAudioMicrophone::start_() {
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 12fbdc97b4..27dc201073 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -287,6 +287,7 @@ void VoiceAssistant::loop() {
           }
         }
         if (this->wait_for_stream_end_) {
+          this->cancel_timeout("playing");
           break;  // We dont want to timeout here as the STREAM_END event will take care of that.
         }
         playing = this->speaker_->is_running();

From b12dc98150d68e9a356c597cc16f1dfc4addf17e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 18 Oct 2023 07:23:34 +1300
Subject: [PATCH 016/131] Fix default libretiny manufacturer reported to HA
 (#5549)

---
 esphome/components/libretiny/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/libretiny/__init__.py b/esphome/components/libretiny/__init__.py
index b01d342a87..e36c08d522 100644
--- a/esphome/components/libretiny/__init__.py
+++ b/esphome/components/libretiny/__init__.py
@@ -251,7 +251,7 @@ async def component_to_code(config):
     # setup board config
     cg.add_platformio_option("board", config[CONF_BOARD])
     cg.add_build_flag("-DUSE_LIBRETINY")
-    cg.add_build_flag(f"-DUSE_{config[CONF_COMPONENT_ID]}")
+    cg.add_build_flag(f"-DUSE_{config[CONF_COMPONENT_ID].upper()}")
     cg.add_build_flag(f"-DUSE_LIBRETINY_VARIANT_{config[CONF_FAMILY]}")
     cg.add_define("ESPHOME_BOARD", config[CONF_BOARD])
     cg.add_define("ESPHOME_VARIANT", FAMILY_FRIENDLY[config[CONF_FAMILY]])

From 6839de69c1730611ad8db6723996aea491a27581 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 17 Oct 2023 11:30:32 -0700
Subject: [PATCH 017/131] add uart button (#5540)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 CODEOWNERS                                    |  1 +
 esphome/components/uart/button/__init__.py    | 35 +++++++++++++++++++
 .../components/uart/button/uart_button.cpp    | 17 +++++++++
 esphome/components/uart/button/uart_button.h  | 24 +++++++++++++
 tests/test1.yaml                              |  4 +++
 5 files changed, 81 insertions(+)
 create mode 100644 esphome/components/uart/button/__init__.py
 create mode 100644 esphome/components/uart/button/uart_button.cpp
 create mode 100644 esphome/components/uart/button/uart_button.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 326642e12c..b66da4fc26 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -323,6 +323,7 @@ esphome/components/tuya/sensor/* @jesserockz
 esphome/components/tuya/switch/* @jesserockz
 esphome/components/tuya/text_sensor/* @dentra
 esphome/components/uart/* @esphome/core
+esphome/components/uart/button/* @ssieb
 esphome/components/ufire_ec/* @pvizeli
 esphome/components/ufire_ise/* @pvizeli
 esphome/components/ultrasonic/* @OttoWinter
diff --git a/esphome/components/uart/button/__init__.py b/esphome/components/uart/button/__init__.py
new file mode 100644
index 0000000000..05909516a0
--- /dev/null
+++ b/esphome/components/uart/button/__init__.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import button, uart
+from esphome.const import CONF_DATA
+from esphome.core import HexInt
+from .. import uart_ns, validate_raw_data
+
+CODEOWNERS = ["@ssieb"]
+
+DEPENDENCIES = ["uart"]
+
+UARTButton = uart_ns.class_("UARTButton", button.Button, uart.UARTDevice, cg.Component)
+
+
+CONFIG_SCHEMA = (
+    button.button_schema(UARTButton)
+    .extend(
+        {
+            cv.Required(CONF_DATA): validate_raw_data,
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = await button.new_button(config)
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
+
+    data = config[CONF_DATA]
+    if isinstance(data, bytes):
+        data = [HexInt(x) for x in data]
+    cg.add(var.set_data(data))
diff --git a/esphome/components/uart/button/uart_button.cpp b/esphome/components/uart/button/uart_button.cpp
new file mode 100644
index 0000000000..4db164c400
--- /dev/null
+++ b/esphome/components/uart/button/uart_button.cpp
@@ -0,0 +1,17 @@
+#include "uart_button.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace uart {
+
+static const char *const TAG = "uart.button";
+
+void UARTButton::press_action() {
+  ESP_LOGD(TAG, "'%s': Sending data...", this->get_name().c_str());
+  this->write_array(this->data_.data(), this->data_.size());
+}
+
+void UARTButton::dump_config() { LOG_BUTTON("", "UART Button", this); }
+
+}  // namespace uart
+}  // namespace esphome
diff --git a/esphome/components/uart/button/uart_button.h b/esphome/components/uart/button/uart_button.h
new file mode 100644
index 0000000000..2d600b199a
--- /dev/null
+++ b/esphome/components/uart/button/uart_button.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/components/button/button.h"
+
+#include <vector>
+
+namespace esphome {
+namespace uart {
+
+class UARTButton : public button::Button, public UARTDevice, public Component {
+ public:
+  void set_data(const std::vector<uint8_t> &data) { this->data_ = data; }
+
+  void dump_config() override;
+
+ protected:
+  void press_action() override;
+  std::vector<uint8_t> data_;
+};
+
+}  // namespace uart
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index b9b4beb5ad..66471377f9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -3504,6 +3504,10 @@ button:
       name: "restart"
     query_params:
       name: query params
+  - platform: uart
+    uart_id: uart_0
+    name: UART button
+    data: "Pressed\r\n"
 
 ld2410:
   id: my_ld2410

From b0ac729a8ed17f5d5626f7911a8ca816d826acdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= <fabian@blaese.de>
Date: Tue, 17 Oct 2023 20:39:05 +0200
Subject: [PATCH 018/131] SML: fix incomplete sign extension for abbreviated
 transmissions (#5544)

---
 esphome/components/sml/sml_parser.cpp | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/esphome/components/sml/sml_parser.cpp b/esphome/components/sml/sml_parser.cpp
index 91b320a30e..3b23522b21 100644
--- a/esphome/components/sml/sml_parser.cpp
+++ b/esphome/components/sml/sml_parser.cpp
@@ -88,11 +88,6 @@ uint64_t bytes_to_uint(const bytes &buffer) {
   for (auto const value : buffer) {
     val = (val << 8) + value;
   }
-  // Some smart meters send 24 bit signed integers. Sign extend to 64 bit if the
-  // 24 bit value is negative.
-  if (buffer.size() == 3 && buffer[0] & 0x80) {
-    val |= 0xFFFFFFFFFF000000;
-  }
   return val;
 }
 
@@ -100,19 +95,15 @@ int64_t bytes_to_int(const bytes &buffer) {
   uint64_t tmp = bytes_to_uint(buffer);
   int64_t val;
 
-  switch (buffer.size()) {
-    case 1:  // int8
-      val = (int8_t) tmp;
-      break;
-    case 2:  // int16
-      val = (int16_t) tmp;
-      break;
-    case 4:  // int32
-      val = (int32_t) tmp;
-      break;
-    default:  // int64
-      val = (int64_t) tmp;
+  // sign extension for abbreviations of leading ones (e.g. 3 byte transmissions, see 6.2.2 of SML protocol definition)
+  // see https://stackoverflow.com/questions/42534749/signed-extension-from-24-bit-to-32-bit-in-c
+  if (buffer.size() < 8) {
+    const int bits = buffer.size() * 8;
+    const uint64_t m = 1u << (bits - 1);
+    tmp = (tmp ^ m) - m;
   }
+
+  val = (int64_t) tmp;
   return val;
 }
 

From c19dbdb02dab3a328c6601971beb70b50fa874b5 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Tue, 17 Oct 2023 12:07:29 -0700
Subject: [PATCH 019/131] add on/off options for uart switch (#5539)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/uart/switch/__init__.py    | 33 +++++++++++++++----
 .../components/uart/switch/uart_switch.cpp    | 26 +++++++++++----
 esphome/components/uart/switch/uart_switch.h  | 10 ++++--
 tests/test1.yaml                              |  6 ++++
 4 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/esphome/components/uart/switch/__init__.py b/esphome/components/uart/switch/__init__.py
index 60f5ddaf0d..8853a61ae3 100644
--- a/esphome/components/uart/switch/__init__.py
+++ b/esphome/components/uart/switch/__init__.py
@@ -9,14 +9,24 @@ DEPENDENCIES = ["uart"]
 
 UARTSwitch = uart_ns.class_("UARTSwitch", switch.Switch, uart.UARTDevice, cg.Component)
 
+CONF_TURN_OFF = "turn_off"
+CONF_TURN_ON = "turn_on"
 
 CONFIG_SCHEMA = (
     switch.switch_schema(UARTSwitch, block_inverted=True)
     .extend(
         {
-            cv.Required(CONF_DATA): validate_raw_data,
+            cv.Required(CONF_DATA): cv.Any(
+                validate_raw_data,
+                cv.Schema(
+                    {
+                        cv.Optional(CONF_TURN_OFF): validate_raw_data,
+                        cv.Optional(CONF_TURN_ON): validate_raw_data,
+                    }
+                ),
+            ),
             cv.Optional(CONF_SEND_EVERY): cv.positive_time_period_milliseconds,
-        }
+        },
     )
     .extend(uart.UART_DEVICE_SCHEMA)
     .extend(cv.COMPONENT_SCHEMA)
@@ -29,9 +39,20 @@ async def to_code(config):
     await uart.register_uart_device(var, config)
 
     data = config[CONF_DATA]
-    if isinstance(data, bytes):
-        data = [HexInt(x) for x in data]
-    cg.add(var.set_data(data))
-
+    if isinstance(data, dict):
+        if data_on := data.get(CONF_TURN_ON):
+            if isinstance(data_on, bytes):
+                data_on = [HexInt(x) for x in data_on]
+            cg.add(var.set_data_on(data_on))
+        if data_off := data.get(CONF_TURN_OFF):
+            if isinstance(data_off, bytes):
+                data_off = [HexInt(x) for x in data_off]
+            cg.add(var.set_data_off(data_off))
+    else:
+        data = config[CONF_DATA]
+        if isinstance(data, bytes):
+            data = [HexInt(x) for x in data]
+        cg.add(var.set_data_on(data))
+        cg.add(var.set_single_state(True))
     if CONF_SEND_EVERY in config:
         cg.add(var.set_send_every(config[CONF_SEND_EVERY]))
diff --git a/esphome/components/uart/switch/uart_switch.cpp b/esphome/components/uart/switch/uart_switch.cpp
index ffed08c731..b995aca98c 100644
--- a/esphome/components/uart/switch/uart_switch.cpp
+++ b/esphome/components/uart/switch/uart_switch.cpp
@@ -7,28 +7,41 @@ namespace uart {
 static const char *const TAG = "uart.switch";
 
 void UARTSwitch::loop() {
-  if (this->state && this->send_every_) {
+  if (this->send_every_) {
     const uint32_t now = millis();
     if (now - this->last_transmission_ > this->send_every_) {
-      this->write_command_();
+      this->write_command_(this->state);
       this->last_transmission_ = now;
     }
   }
 }
 
-void UARTSwitch::write_command_() {
-  ESP_LOGD(TAG, "'%s': Sending data...", this->get_name().c_str());
-  this->write_array(this->data_.data(), this->data_.size());
+void UARTSwitch::write_command_(bool state) {
+  if (state && !this->data_on_.empty()) {
+    ESP_LOGD(TAG, "'%s': Sending on data...", this->get_name().c_str());
+    this->write_array(this->data_on_.data(), this->data_on_.size());
+  }
+  if (!state && !this->data_off_.empty()) {
+    ESP_LOGD(TAG, "'%s': Sending off data...", this->get_name().c_str());
+    this->write_array(this->data_off_.data(), this->data_off_.size());
+  }
 }
 
 void UARTSwitch::write_state(bool state) {
+  if (!this->single_state_) {
+    this->publish_state(state);
+    this->write_command_(state);
+    this->last_transmission_ = millis();
+    return;
+  }
+
   if (!state) {
     this->publish_state(false);
     return;
   }
 
   this->publish_state(true);
-  this->write_command_();
+  this->write_command_(true);
 
   if (this->send_every_ == 0) {
     this->publish_state(false);
@@ -36,6 +49,7 @@ void UARTSwitch::write_state(bool state) {
     this->last_transmission_ = millis();
   }
 }
+
 void UARTSwitch::dump_config() {
   LOG_SWITCH("", "UART Switch", this);
   if (this->send_every_) {
diff --git a/esphome/components/uart/switch/uart_switch.h b/esphome/components/uart/switch/uart_switch.h
index 4f24d76d0c..eb3d697a58 100644
--- a/esphome/components/uart/switch/uart_switch.h
+++ b/esphome/components/uart/switch/uart_switch.h
@@ -13,15 +13,19 @@ class UARTSwitch : public switch_::Switch, public UARTDevice, public Component {
  public:
   void loop() override;
 
-  void set_data(const std::vector<uint8_t> &data) { data_ = data; }
+  void set_data_on(const std::vector<uint8_t> &data) { this->data_on_ = data; }
+  void set_data_off(const std::vector<uint8_t> &data) { this->data_off_ = data; }
   void set_send_every(uint32_t send_every) { this->send_every_ = send_every; }
+  void set_single_state(bool single) { this->single_state_ = single; }
 
   void dump_config() override;
 
  protected:
-  void write_command_();
+  void write_command_(bool state);
   void write_state(bool state) override;
-  std::vector<uint8_t> data_;
+  std::vector<uint8_t> data_on_;
+  std::vector<uint8_t> data_off_;
+  bool single_state_{false};
   uint32_t send_every_;
   uint32_t last_transmission_;
 };
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 66471377f9..9bf9a32e17 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2588,6 +2588,12 @@ switch:
     name: UART Recurring Output
     data: [0xDE, 0xAD, 0xBE, 0xEF]
     send_every: 1s
+  - platform: uart
+    uart_id: uart_0
+    name: "UART On/Off"
+    data:
+      turn_on: "TurnOn\r\n"
+      turn_off: "TurnOff\r\n"
   - platform: template
     assumed_state: true
     name: Stepper Switch

From 14aa27f5e2df02dbe251f72ef0869e87405c15a0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 18 Oct 2023 14:26:47 +1300
Subject: [PATCH 020/131] esp32_improv advertise capabilities and state in ble
 service data (#5553)

---
 .../components/esp32_ble/ble_advertising.cpp  | 21 +++++++++++++------
 .../components/esp32_ble/ble_advertising.h    |  1 +
 .../esp32_improv/esp32_improv_component.cpp   | 19 +++++++++++++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/esphome/components/esp32_ble/ble_advertising.cpp b/esphome/components/esp32_ble/ble_advertising.cpp
index 072bb38c07..59d2398829 100644
--- a/esphome/components/esp32_ble/ble_advertising.cpp
+++ b/esphome/components/esp32_ble/ble_advertising.cpp
@@ -2,9 +2,9 @@
 
 #ifdef USE_ESP32
 
-#include "ble_uuid.h"
-#include <cstring>
 #include <cstdio>
+#include <cstring>
+#include "ble_uuid.h"
 #include "esphome/core/log.h"
 
 namespace esphome {
@@ -16,8 +16,8 @@ BLEAdvertising::BLEAdvertising() {
   this->advertising_data_.set_scan_rsp = false;
   this->advertising_data_.include_name = true;
   this->advertising_data_.include_txpower = true;
-  this->advertising_data_.min_interval = 0x20;
-  this->advertising_data_.max_interval = 0x40;
+  this->advertising_data_.min_interval = 0;
+  this->advertising_data_.max_interval = 0;
   this->advertising_data_.appearance = 0x00;
   this->advertising_data_.manufacturer_len = 0;
   this->advertising_data_.p_manufacturer_data = nullptr;
@@ -42,6 +42,17 @@ void BLEAdvertising::remove_service_uuid(ESPBTUUID uuid) {
                                  this->advertising_uuids_.end());
 }
 
+void BLEAdvertising::set_service_data(const std::vector<uint8_t> &data) {
+  delete[] this->advertising_data_.p_service_data;
+  this->advertising_data_.p_service_data = nullptr;
+  this->advertising_data_.service_data_len = data.size();
+  if (!data.empty()) {
+    // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
+    this->advertising_data_.p_service_data = new uint8_t[data.size()];
+    memcpy(this->advertising_data_.p_service_data, data.data(), data.size());
+  }
+}
+
 void BLEAdvertising::set_manufacturer_data(const std::vector<uint8_t> &data) {
   delete[] this->advertising_data_.p_manufacturer_data;
   this->advertising_data_.p_manufacturer_data = nullptr;
@@ -85,8 +96,6 @@ void BLEAdvertising::start() {
     this->scan_response_data_.set_scan_rsp = true;
     this->scan_response_data_.include_name = true;
     this->scan_response_data_.include_txpower = true;
-    this->scan_response_data_.min_interval = 0;
-    this->scan_response_data_.max_interval = 0;
     this->scan_response_data_.manufacturer_len = 0;
     this->scan_response_data_.appearance = 0;
     this->scan_response_data_.flag = 0;
diff --git a/esphome/components/esp32_ble/ble_advertising.h b/esphome/components/esp32_ble/ble_advertising.h
index 9e4e2b7701..16a7dd1d8e 100644
--- a/esphome/components/esp32_ble/ble_advertising.h
+++ b/esphome/components/esp32_ble/ble_advertising.h
@@ -21,6 +21,7 @@ class BLEAdvertising {
   void set_scan_response(bool scan_response) { this->scan_response_ = scan_response; }
   void set_min_preferred_interval(uint16_t interval) { this->advertising_data_.min_interval = interval; }
   void set_manufacturer_data(const std::vector<uint8_t> &data);
+  void set_service_data(const std::vector<uint8_t> &data);
 
   void start();
   void stop();
diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 8a901a79e5..19340c3dd8 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -189,6 +189,25 @@ void ESP32ImprovComponent::set_state_(improv::State state) {
     if (state != improv::STATE_STOPPED)
       this->status_->notify();
   }
+  std::vector<uint8_t> service_data(8, 0);
+  service_data[0] = 0x77;  // PR
+  service_data[1] = 0x46;  // IM
+  service_data[2] = static_cast<uint8_t>(state);
+
+  uint8_t capabilities = 0x00;
+#ifdef USE_OUTPUT
+  if (this->status_indicator_ != nullptr)
+    capabilities |= improv::CAPABILITY_IDENTIFY;
+#endif
+
+  service_data[3] = capabilities;
+  service_data[4] = 0x00;  // Reserved
+  service_data[5] = 0x00;  // Reserved
+  service_data[6] = 0x00;  // Reserved
+  service_data[7] = 0x00;  // Reserved
+
+  esp32_ble::global_ble->get_advertising()->set_service_data(service_data);
+  esp32_ble::global_ble->get_advertising()->start();
 }
 
 void ESP32ImprovComponent::set_error_(improv::Error error) {

From 8ef743f25e3387ef69fb6f9cb000a492b6bbb2b2 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 17 Oct 2023 20:33:19 -1000
Subject: [PATCH 021/131] Update docker base and packages + docker python 3.11
 (#5473)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 docker/Dockerfile         | 73 ++++++++++++++++++++++-----------------
 requirements_optional.txt |  4 +--
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 5ca36d1c13..f076173519 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,38 +6,47 @@
 ARG BASEIMGTYPE=docker
 
 # https://github.com/hassio-addons/addon-debian-base/releases
-FROM ghcr.io/hassio-addons/debian-base:6.2.3 AS base-hassio
-# https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye
-FROM debian:bullseye-20230208-slim AS base-docker
+FROM ghcr.io/hassio-addons/debian-base:7.2.0 AS base-hassio
+# https://hub.docker.com/_/debian?tab=tags&page=1&name=bookworm
+FROM debian:12.2-slim AS base-docker
 
 FROM base-${BASEIMGTYPE} AS base
 
 ARG TARGETARCH
 ARG TARGETVARIANT
 
+# Note that --break-system-packages is used below because
+# https://peps.python.org/pep-0668/ added a safety check that prevents
+# installing packages with the same name as a system package. This is
+# not a problem for us because we are not concerned about overwriting
+# system packages because we are running in an isolated container.
+
 RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        python3=3.9.2-3 \
-        python3-pip=20.3.4-4+deb11u1 \
-        python3-setuptools=52.0.0-4 \
-        python3-cryptography=3.3.2-1 \
-        python3-venv=3.9.2-3 \
-        iputils-ping=3:20210202-1 \
-        git=1:2.30.2-1+deb11u2 \
-        curl=7.74.0-1.3+deb11u10 \
-        openssh-client=1:8.4p1-5+deb11u2 \
-        python3-cffi=1.14.5-1 \
-        libcairo2=1.16.0-5 \
+        python3-pip=23.0.1+dfsg-1 \
+        python3-setuptools=66.1.1-1 \
+        python3-venv=3.11.2-1+b1 \
+        python3-wheel=0.38.4-2 \
+        iputils-ping=3:20221126-1 \
+        git=1:2.39.2-1.1 \
+        curl=7.88.1-10+deb12u4 \
+        openssh-client=1:9.2p1-2+deb12u1 \
+        python3-cffi=1.15.1-5 \
+        libcairo2=1.16.0-7 \
         patch=2.7.6-7; \
     if [ "$TARGETARCH$TARGETVARIANT" = "armv7" ]; then \
         apt-get install -y --no-install-recommends \
           build-essential=12.9 \
-          python3-dev=3.9.2-3 \
-          zlib1g-dev=1:1.2.11.dfsg-2+deb11u2 \
-          libjpeg-dev=1:2.0.6-4 \
-          libfreetype-dev=2.10.4+dfsg-1+deb11u1; \
+          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 \
+          libssl-dev=3.0.11-1~deb12u1 \
+          libffi-dev=3.4.4-1 \
+          cargo=0.66.0+ds1-1 \
+          pkg-config=1.8.1-1; \
     fi; \
     rm -rf \
         /tmp/* \
@@ -50,6 +59,7 @@ ENV \
   # Store globally installed pio libs in /piolibs
   PLATFORMIO_GLOBALLIB_DIR=/piolibs
 
+
 # Support legacy binaries on Debian multiarch system. There is no "correct" way
 # to do this, other than using properly built toolchains...
 # See: https://unix.stackexchange.com/questions/553743/correct-way-to-add-lib-ld-linux-so-3-in-debian
@@ -60,8 +70,7 @@ RUN \
 
 RUN \
     # Ubuntu python3-pip is missing wheel
-    pip3 install --no-cache-dir \
-        wheel==0.37.1 \
+    pip3 install --break-system-packages --no-cache-dir \
         platformio==6.1.11 \
     # Change some platformio settings
     && platformio settings set enable_telemetry No \
@@ -70,9 +79,11 @@ RUN \
 
 
 # First install requirements to leverage caching when requirements don't change
+# tmpfs is for https://github.com/rust-lang/cargo/issues/8719
+
 COPY requirements.txt requirements_optional.txt script/platformio_install_deps.py platformio.ini /
-RUN \
-    pip3 install --no-cache-dir -r /requirements.txt -r /requirements_optional.txt \
+RUN --mount=type=tmpfs,target=/root/.cargo 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 \
     && /platformio_install_deps.py /platformio.ini --libraries
 
 
@@ -81,7 +92,7 @@ FROM base AS docker
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --break-system-packages --no-cache-dir --no-use-pep517 -e /esphome
 
 # Settings for dashboard
 ENV USERNAME="" PASSWORD=""
@@ -110,7 +121,7 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        nginx-light=1.18.0-6.1+deb11u3 \
+        nginx-light=1.22.1-9 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
@@ -123,7 +134,7 @@ COPY docker/ha-addon-rootfs/ /
 
 # Copy esphome and install
 COPY . /esphome
-RUN pip3 install --no-cache-dir --no-use-pep517 -e /esphome
+RUN pip3 install --break-system-packages --no-cache-dir --no-use-pep517 -e /esphome
 
 # Labels
 LABEL \
@@ -146,20 +157,20 @@ RUN \
     apt-get update \
     # Use pinned versions so that we get updates with build caching
     && apt-get install -y --no-install-recommends \
-        clang-format-13=1:13.0.1-6~deb11u1 \
-        clang-tidy-11=1:11.0.1-2 \
+        clang-format-13=1:13.0.1-11+b2 \
+        clang-tidy-14=1:14.0.6-12 \
         patch=2.7.6-7 \
-        software-properties-common=0.96.20.2-2.1 \
-        nano=5.4-2+deb11u2 \
+        software-properties-common=0.99.30-4 \
+        nano=7.2-1 \
         build-essential=12.9 \
-        python3-dev=3.9.2-3 \
+        python3-dev=3.11.2-1+b1 \
     && rm -rf \
         /tmp/* \
         /var/{cache,log}/* \
         /var/lib/apt/lists/*
 
 COPY requirements_test.txt /
-RUN pip3 install --no-cache-dir -r /requirements_test.txt
+RUN pip3 install --break-system-packages --no-cache-dir -r /requirements_test.txt
 
 VOLUME ["/esphome"]
 WORKDIR /esphome
diff --git a/requirements_optional.txt b/requirements_optional.txt
index 236f5e3f13..40c27f8547 100644
--- a/requirements_optional.txt
+++ b/requirements_optional.txt
@@ -1,3 +1,3 @@
 pillow==10.0.1
-cairosvg>=2.2.0
-cryptography>=2.0.0,<4
+cairosvg==2.7.1
+cryptography==41.0.4

From cdc4f7f59b53d185bf1a252dd57a24c648ba47ff Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Wed, 18 Oct 2023 01:33:36 -0500
Subject: [PATCH 022/131] IDF 5 fixes for various components from test1.yaml
 (#5451)

---
 esphome/components/binary_sensor/automation.cpp  | 11 ++++++-----
 esphome/components/binary_sensor/automation.h    |  1 +
 esphome/components/canbus/canbus.cpp             | 16 +++++++++-------
 esphome/components/canbus/canbus.h               |  1 +
 .../components/climate_ir_lg/climate_ir_lg.cpp   |  4 ++--
 esphome/components/climate_ir_lg/climate_ir_lg.h |  2 ++
 esphome/components/coolix/coolix.cpp             |  4 ++--
 esphome/components/coolix/coolix.h               |  2 ++
 esphome/components/cs5460a/cs5460a.cpp           |  4 ++--
 esphome/components/cs5460a/cs5460a.h             |  2 ++
 .../deep_sleep/deep_sleep_component.cpp          | 13 +++++++------
 .../components/deep_sleep/deep_sleep_component.h |  2 ++
 esphome/components/e131/e131.h                   |  1 +
 .../e131/e131_addressable_light_effect.cpp       |  4 ++--
 esphome/components/hlw8012/hlw8012.cpp           |  2 +-
 esphome/components/hlw8012/hlw8012.h             |  2 ++
 esphome/components/hx711/hx711.cpp               |  2 +-
 esphome/components/hx711/hx711.h                 |  2 ++
 esphome/components/hyt271/hyt271.cpp             |  2 +-
 esphome/components/ili9xxx/ili9xxx_display.cpp   |  2 +-
 esphome/components/ili9xxx/ili9xxx_init.h        |  2 ++
 esphome/components/ina219/ina219.cpp             |  2 +-
 esphome/components/ina219/ina219.h               |  2 ++
 esphome/components/max31855/max31855.cpp         | 10 +++++-----
 esphome/components/max31855/max31855.h           |  2 ++
 esphome/components/max31856/max31856.cpp         |  2 +-
 esphome/components/max31856/max31856.h           |  2 ++
 esphome/components/mitsubishi/mitsubishi.cpp     |  4 ++--
 esphome/components/mitsubishi/mitsubishi.h       |  2 ++
 esphome/components/ota/__init__.py               |  2 +-
 esphome/components/ota/automation.h              |  2 +-
 esphome/components/power_supply/power_supply.cpp |  2 +-
 esphome/components/power_supply/power_supply.h   |  2 ++
 .../pulse_counter/pulse_counter_sensor.cpp       |  6 +++---
 .../pulse_counter/pulse_counter_sensor.h         |  2 ++
 .../pulse_meter/pulse_meter_sensor.cpp           | 12 +++++++-----
 .../components/pulse_meter/pulse_meter_sensor.h  |  2 ++
 .../pvvx_mithermometer/display/pvvx_display.cpp  |  6 +++++-
 .../pvvx_mithermometer/display/pvvx_display.h    |  2 ++
 esphome/components/rdm6300/rdm6300.cpp           |  2 +-
 esphome/components/rdm6300/rdm6300.h             |  1 +
 esphome/components/remote_base/__init__.py       | 13 ++++---------
 .../components/remote_base/coolix_protocol.cpp   |  6 +++---
 esphome/components/remote_base/coolix_protocol.h |  2 ++
 .../components/remote_base/drayton_protocol.cpp  |  6 +++---
 .../components/remote_base/drayton_protocol.h    |  2 ++
 esphome/components/remote_base/jvc_protocol.cpp  |  2 +-
 esphome/components/remote_base/jvc_protocol.h    |  2 ++
 esphome/components/remote_base/lg_protocol.cpp   |  2 +-
 esphome/components/remote_base/lg_protocol.h     |  2 ++
 .../remote_base/magiquest_protocol.cpp           |  2 +-
 .../components/remote_base/magiquest_protocol.h  |  2 ++
 esphome/components/remote_base/nexa_protocol.cpp |  2 +-
 esphome/components/remote_base/nexa_protocol.h   |  2 ++
 .../remote_base/panasonic_protocol.cpp           |  2 +-
 .../components/remote_base/panasonic_protocol.h  |  2 ++
 esphome/components/remote_base/raw_protocol.cpp  |  8 ++++----
 esphome/components/remote_base/raw_protocol.h    |  1 +
 .../remote_base/samsung36_protocol.cpp           |  2 +-
 .../components/remote_base/samsung36_protocol.h  |  2 ++
 esphome/components/remote_base/sony_protocol.cpp |  2 +-
 esphome/components/remote_base/sony_protocol.h   |  2 ++
 .../components/remote_receiver/remote_receiver.h |  2 ++
 .../remote_receiver/remote_receiver_esp32.cpp    |  2 +-
 esphome/components/sgp30/sgp30.cpp               |  2 +-
 esphome/components/sgp30/sgp30.h                 |  2 ++
 esphome/components/sht3xd/sht3xd.cpp             |  2 +-
 esphome/components/sht3xd/sht3xd.h               |  2 ++
 esphome/components/sht4x/sht4x.cpp               |  2 +-
 esphome/components/sht4x/sht4x.h                 |  2 ++
 esphome/components/sts3x/sts3x.cpp               |  2 +-
 esphome/components/sts3x/sts3x.h                 |  2 ++
 .../template_alarm_control_panel.cpp             | 12 ++++++------
 .../template_alarm_control_panel.h               |  1 +
 esphome/components/tsl2591/tsl2591.cpp           |  4 ++--
 esphome/components/tsl2591/tsl2591.h             |  2 ++
 esphome/components/uart/switch/uart_switch.cpp   |  2 +-
 esphome/components/uart/switch/uart_switch.h     |  1 +
 .../components/ultrasonic/ultrasonic_sensor.cpp  |  6 +++---
 .../components/ultrasonic/ultrasonic_sensor.h    |  2 ++
 esphome/components/whynter/whynter.cpp           |  4 ++--
 esphome/components/whynter/whynter.h             |  2 ++
 82 files changed, 173 insertions(+), 97 deletions(-)

diff --git a/esphome/components/binary_sensor/automation.cpp b/esphome/components/binary_sensor/automation.cpp
index ce082aafb3..bfec882e07 100644
--- a/esphome/components/binary_sensor/automation.cpp
+++ b/esphome/components/binary_sensor/automation.cpp
@@ -22,7 +22,7 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
     // Start matching
     MultiClickTriggerEvent evt = this->timing_[0];
     if (evt.state == state) {
-      ESP_LOGV(TAG, "START min=%u max=%u", evt.min_length, evt.max_length);
+      ESP_LOGV(TAG, "START min=%" PRIu32 " max=%" PRIu32, evt.min_length, evt.max_length);
       ESP_LOGV(TAG, "Multi Click: Starting multi click action!");
       this->at_index_ = 1;
       if (this->timing_.size() == 1 && evt.max_length == 4294967294UL) {
@@ -51,15 +51,15 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
   MultiClickTriggerEvent evt = this->timing_[*this->at_index_];
 
   if (evt.max_length != 4294967294UL) {
-    ESP_LOGV(TAG, "A i=%u min=%u max=%u", *this->at_index_, evt.min_length, evt.max_length);  // NOLINT
+    ESP_LOGV(TAG, "A i=%u min=%" PRIu32 " max=%" PRIu32, *this->at_index_, evt.min_length, evt.max_length);  // NOLINT
     this->schedule_is_valid_(evt.min_length);
     this->schedule_is_not_valid_(evt.max_length);
   } else if (*this->at_index_ + 1 != this->timing_.size()) {
-    ESP_LOGV(TAG, "B i=%u min=%u", *this->at_index_, evt.min_length);  // NOLINT
+    ESP_LOGV(TAG, "B i=%u min=%" PRIu32, *this->at_index_, evt.min_length);  // NOLINT
     this->cancel_timeout("is_not_valid");
     this->schedule_is_valid_(evt.min_length);
   } else {
-    ESP_LOGV(TAG, "C i=%u min=%u", *this->at_index_, evt.min_length);  // NOLINT
+    ESP_LOGV(TAG, "C i=%u min=%" PRIu32, *this->at_index_, evt.min_length);  // NOLINT
     this->is_valid_ = false;
     this->cancel_timeout("is_not_valid");
     this->set_timeout("trigger", evt.min_length, [this]() { this->trigger_(); });
@@ -68,7 +68,8 @@ void binary_sensor::MultiClickTrigger::on_state_(bool state) {
   *this->at_index_ = *this->at_index_ + 1;
 }
 void binary_sensor::MultiClickTrigger::schedule_cooldown_() {
-  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %u ms...", this->invalid_cooldown_);
+  ESP_LOGV(TAG, "Multi Click: Invalid length of press, starting cooldown of %" PRIu32 " ms...",
+           this->invalid_cooldown_);
   this->is_in_cooldown_ = true;
   this->set_timeout("cooldown", this->invalid_cooldown_, [this]() {
     ESP_LOGV(TAG, "Multi Click: Cooldown ended, matching is now enabled again.");
diff --git a/esphome/components/binary_sensor/automation.h b/esphome/components/binary_sensor/automation.h
index de527d1070..a5e9d208a1 100644
--- a/esphome/components/binary_sensor/automation.h
+++ b/esphome/components/binary_sensor/automation.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cinttypes>
 #include <utility>
 #include <vector>
 
diff --git a/esphome/components/canbus/canbus.cpp b/esphome/components/canbus/canbus.cpp
index 6316c77ff4..8cffebdaa0 100644
--- a/esphome/components/canbus/canbus.cpp
+++ b/esphome/components/canbus/canbus.cpp
@@ -16,9 +16,9 @@ void Canbus::setup() {
 
 void Canbus::dump_config() {
   if (this->use_extended_id_) {
-    ESP_LOGCONFIG(TAG, "config extended id=0x%08x", this->can_id_);
+    ESP_LOGCONFIG(TAG, "config extended id=0x%08" PRIx32, this->can_id_);
   } else {
-    ESP_LOGCONFIG(TAG, "config standard id=0x%03x", this->can_id_);
+    ESP_LOGCONFIG(TAG, "config standard id=0x%03" PRIx32, this->can_id_);
   }
 }
 
@@ -28,9 +28,11 @@ void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transm
 
   uint8_t size = static_cast<uint8_t>(data.size());
   if (use_extended_id) {
-    ESP_LOGD(TAG, "send extended id=0x%08x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
+    ESP_LOGD(TAG, "send extended id=0x%08" PRIx32 " rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request),
+             size);
   } else {
-    ESP_LOGD(TAG, "send standard id=0x%03x rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request), size);
+    ESP_LOGD(TAG, "send standard id=0x%03" PRIx32 " rtr=%s size=%d", can_id, TRUEFALSE(remote_transmission_request),
+             size);
   }
   if (size > CAN_MAX_DATA_LENGTH)
     size = CAN_MAX_DATA_LENGTH;
@@ -63,10 +65,10 @@ void Canbus::loop() {
   while (this->read_message(&can_message) == canbus::ERROR_OK) {
     message_counter++;
     if (can_message.use_extended_id) {
-      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%x size=%d", message_counter, can_message.can_id,
-               can_message.can_data_length_code);
+      ESP_LOGD(TAG, "received can message (#%d) extended can_id=0x%" PRIx32 " size=%d", message_counter,
+               can_message.can_id, can_message.can_data_length_code);
     } else {
-      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%x size=%d", message_counter, can_message.can_id,
+      ESP_LOGD(TAG, "received can message (#%d) std can_id=0x%" PRIx32 " size=%d", message_counter, can_message.can_id,
                can_message.can_data_length_code);
     }
 
diff --git a/esphome/components/canbus/canbus.h b/esphome/components/canbus/canbus.h
index c0ccff4866..1e5214fef4 100644
--- a/esphome/components/canbus/canbus.h
+++ b/esphome/components/canbus/canbus.h
@@ -4,6 +4,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/optional.h"
 
+#include <cinttypes>
 #include <vector>
 
 namespace esphome {
diff --git a/esphome/components/climate_ir_lg/climate_ir_lg.cpp b/esphome/components/climate_ir_lg/climate_ir_lg.cpp
index a41aad1bd0..d2199c1cbe 100644
--- a/esphome/components/climate_ir_lg/climate_ir_lg.cpp
+++ b/esphome/components/climate_ir_lg/climate_ir_lg.cpp
@@ -121,7 +121,7 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
     }
   }
 
-  ESP_LOGD(TAG, "Decoded 0x%02X", remote_state);
+  ESP_LOGD(TAG, "Decoded 0x%02" PRIX32, remote_state);
   if ((remote_state & 0xFF00000) != 0x8800000)
     return false;
 
@@ -173,7 +173,7 @@ bool LgIrClimate::on_receive(remote_base::RemoteReceiveData data) {
 }
 void LgIrClimate::transmit_(uint32_t value) {
   calc_checksum_(value);
-  ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02X", value);
+  ESP_LOGD(TAG, "Sending climate_lg_ir code: 0x%02" PRIX32, value);
 
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();
diff --git a/esphome/components/climate_ir_lg/climate_ir_lg.h b/esphome/components/climate_ir_lg/climate_ir_lg.h
index 6b38b3247b..34f50744ef 100644
--- a/esphome/components/climate_ir_lg/climate_ir_lg.h
+++ b/esphome/components/climate_ir_lg/climate_ir_lg.h
@@ -2,6 +2,8 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace climate_ir_lg {
 
diff --git a/esphome/components/coolix/coolix.cpp b/esphome/components/coolix/coolix.cpp
index 6233014a96..f4309419a4 100644
--- a/esphome/components/coolix/coolix.cpp
+++ b/esphome/components/coolix/coolix.cpp
@@ -101,7 +101,7 @@ void CoolixClimate::transmit_state() {
       }
     }
   }
-  ESP_LOGV(TAG, "Sending coolix code: 0x%06X", remote_state);
+  ESP_LOGV(TAG, "Sending coolix code: 0x%06" PRIX32, remote_state);
 
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();
@@ -115,7 +115,7 @@ bool CoolixClimate::on_coolix(climate::Climate *parent, remote_base::RemoteRecei
     return false;
   // Decoded remote state y 3 bytes long code.
   uint32_t remote_state = (*decoded).second;
-  ESP_LOGV(TAG, "Decoded 0x%06X", remote_state);
+  ESP_LOGV(TAG, "Decoded 0x%06" PRIX32, remote_state);
   if ((remote_state & 0xFF0000) != 0xB20000)
     return false;
 
diff --git a/esphome/components/coolix/coolix.h b/esphome/components/coolix/coolix.h
index 3419795875..f4b4ff8e0e 100644
--- a/esphome/components/coolix/coolix.h
+++ b/esphome/components/coolix/coolix.h
@@ -2,6 +2,8 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace coolix {
 
diff --git a/esphome/components/cs5460a/cs5460a.cpp b/esphome/components/cs5460a/cs5460a.cpp
index fb8e50b87a..0d347ae0c1 100644
--- a/esphome/components/cs5460a/cs5460a.cpp
+++ b/esphome/components/cs5460a/cs5460a.cpp
@@ -86,7 +86,7 @@ void CS5460AComponent::hw_init_() {
   }
 
   uint32_t status = this->read_register_(REG_STATUS);
-  ESP_LOGCONFIG(TAG, "  Version: %x", (status >> 6) & 7);
+  ESP_LOGCONFIG(TAG, "  Version: %" PRIx32, (status >> 6) & 7);
 
   this->write_register_(REG_CYCLE_COUNT, samples_);
   this->write_register_(REG_PULSE_RATE, lroundf(pulse_freq_ * 32.0f));
@@ -323,7 +323,7 @@ void CS5460AComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Init status: %s",
                 state == COMPONENT_STATE_LOOP ? "OK" : (state == COMPONENT_STATE_FAILED ? "failed" : "other"));
   LOG_PIN("  CS Pin: ", cs_);
-  ESP_LOGCONFIG(TAG, "  Samples / cycle: %u", samples_);
+  ESP_LOGCONFIG(TAG, "  Samples / cycle: %" PRIu32, samples_);
   ESP_LOGCONFIG(TAG, "  Phase offset: %i", phase_offset_);
   ESP_LOGCONFIG(TAG, "  PGA Gain: %s", pga_gain_ == CS5460A_PGA_GAIN_50X ? "50x" : "10x");
   ESP_LOGCONFIG(TAG, "  Current gain: %.5f", current_gain_);
diff --git a/esphome/components/cs5460a/cs5460a.h b/esphome/components/cs5460a/cs5460a.h
index 699049757c..763ddc14fa 100644
--- a/esphome/components/cs5460a/cs5460a.h
+++ b/esphome/components/cs5460a/cs5460a.h
@@ -5,6 +5,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace cs5460a {
 
diff --git a/esphome/components/deep_sleep/deep_sleep_component.cpp b/esphome/components/deep_sleep/deep_sleep_component.cpp
index f6472a123c..328e972e6b 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.cpp
+++ b/esphome/components/deep_sleep/deep_sleep_component.cpp
@@ -39,7 +39,7 @@ void DeepSleepComponent::setup() {
 
   const optional<uint32_t> run_duration = get_run_duration_();
   if (run_duration.has_value()) {
-    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %u ms", *run_duration);
+    ESP_LOGI(TAG, "Scheduling Deep Sleep to start in %" PRIu32 " ms", *run_duration);
     this->set_timeout(*run_duration, [this]() { this->begin_sleep(); });
   } else {
     ESP_LOGD(TAG, "Not scheduling Deep Sleep, as no run duration is configured.");
@@ -49,19 +49,20 @@ void DeepSleepComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "Setting up Deep Sleep...");
   if (this->sleep_duration_.has_value()) {
     uint32_t duration = *this->sleep_duration_ / 1000;
-    ESP_LOGCONFIG(TAG, "  Sleep Duration: %u ms", duration);
+    ESP_LOGCONFIG(TAG, "  Sleep Duration: %" PRIu32 " ms", duration);
   }
   if (this->run_duration_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Run Duration: %u ms", *this->run_duration_);
+    ESP_LOGCONFIG(TAG, "  Run Duration: %" PRIu32 " ms", *this->run_duration_);
   }
 #ifdef USE_ESP32
   if (wakeup_pin_ != nullptr) {
     LOG_PIN("  Wakeup Pin: ", this->wakeup_pin_);
   }
   if (this->wakeup_cause_to_run_duration_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Default Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->default_cause);
-    ESP_LOGCONFIG(TAG, "  Touch Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->touch_cause);
-    ESP_LOGCONFIG(TAG, "  GPIO Wakeup Run Duration: %u ms", this->wakeup_cause_to_run_duration_->gpio_cause);
+    ESP_LOGCONFIG(TAG, "  Default Wakeup Run Duration: %" PRIu32 " ms",
+                  this->wakeup_cause_to_run_duration_->default_cause);
+    ESP_LOGCONFIG(TAG, "  Touch Wakeup Run Duration: %" PRIu32 " ms", this->wakeup_cause_to_run_duration_->touch_cause);
+    ESP_LOGCONFIG(TAG, "  GPIO Wakeup Run Duration: %" PRIu32 " ms", this->wakeup_cause_to_run_duration_->gpio_cause);
   }
 #endif
 }
diff --git a/esphome/components/deep_sleep/deep_sleep_component.h b/esphome/components/deep_sleep/deep_sleep_component.h
index 2e54e53c56..e97d8300c4 100644
--- a/esphome/components/deep_sleep/deep_sleep_component.h
+++ b/esphome/components/deep_sleep/deep_sleep_component.h
@@ -14,6 +14,8 @@
 #include "esphome/core/time.h"
 #endif
 
+#include <cinttypes>
+
 namespace esphome {
 namespace deep_sleep {
 
diff --git a/esphome/components/e131/e131.h b/esphome/components/e131/e131.h
index 364a05af75..91b67f62eb 100644
--- a/esphome/components/e131/e131.h
+++ b/esphome/components/e131/e131.h
@@ -3,6 +3,7 @@
 #include "esphome/components/socket/socket.h"
 #include "esphome/core/component.h"
 
+#include <cinttypes>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/esphome/components/e131/e131_addressable_light_effect.cpp b/esphome/components/e131/e131_addressable_light_effect.cpp
index 6b6a726ef3..be3144f590 100644
--- a/esphome/components/e131/e131_addressable_light_effect.cpp
+++ b/esphome/components/e131/e131_addressable_light_effect.cpp
@@ -57,8 +57,8 @@ bool E131AddressableLightEffect::process_(int universe, const E131Packet &packet
       std::min(it->size(), std::min(output_offset + get_lights_per_universe(), output_offset + packet.count - 1));
   auto *input_data = packet.values + 1;
 
-  ESP_LOGV(TAG, "Applying data for '%s' on %d universe, for %d-%d.", get_name().c_str(), universe, output_offset,
-           output_end);
+  ESP_LOGV(TAG, "Applying data for '%s' on %d universe, for %" PRId32 "-%d.", get_name().c_str(), universe,
+           output_offset, output_end);
 
   switch (channels_) {
     case E131_MONO:
diff --git a/esphome/components/hlw8012/hlw8012.cpp b/esphome/components/hlw8012/hlw8012.cpp
index ecdaa07ab2..1a9f47faaf 100644
--- a/esphome/components/hlw8012/hlw8012.cpp
+++ b/esphome/components/hlw8012/hlw8012.cpp
@@ -38,7 +38,7 @@ void HLW8012Component::dump_config() {
   LOG_PIN("  SEL Pin: ", this->sel_pin_)
   LOG_PIN("  CF Pin: ", this->cf_pin_)
   LOG_PIN("  CF1 Pin: ", this->cf1_pin_)
-  ESP_LOGCONFIG(TAG, "  Change measurement mode every %u", this->change_mode_every_);
+  ESP_LOGCONFIG(TAG, "  Change measurement mode every %" PRIu32, this->change_mode_every_);
   ESP_LOGCONFIG(TAG, "  Current resistor: %.1f mΩ", this->current_resistor_ * 1000.0f);
   ESP_LOGCONFIG(TAG, "  Voltage Divider: %.1f", this->voltage_divider_);
   LOG_UPDATE_INTERVAL(this)
diff --git a/esphome/components/hlw8012/hlw8012.h b/esphome/components/hlw8012/hlw8012.h
index adb49ffb66..312391f533 100644
--- a/esphome/components/hlw8012/hlw8012.h
+++ b/esphome/components/hlw8012/hlw8012.h
@@ -5,6 +5,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/pulse_counter/pulse_counter_sensor.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace hlw8012 {
 
diff --git a/esphome/components/hx711/hx711.cpp b/esphome/components/hx711/hx711.cpp
index 62adc4ae86..dbbf4c91f4 100644
--- a/esphome/components/hx711/hx711.cpp
+++ b/esphome/components/hx711/hx711.cpp
@@ -28,7 +28,7 @@ void HX711Sensor::update() {
   uint32_t result;
   if (this->read_sensor_(&result)) {
     int32_t value = static_cast<int32_t>(result);
-    ESP_LOGD(TAG, "'%s': Got value %d", this->name_.c_str(), value);
+    ESP_LOGD(TAG, "'%s': Got value %" PRId32, this->name_.c_str(), value);
     this->publish_state(value);
   }
 }
diff --git a/esphome/components/hx711/hx711.h b/esphome/components/hx711/hx711.h
index 9fef649b03..0cb6868ab5 100644
--- a/esphome/components/hx711/hx711.h
+++ b/esphome/components/hx711/hx711.h
@@ -4,6 +4,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace hx711 {
 
diff --git a/esphome/components/hyt271/hyt271.cpp b/esphome/components/hyt271/hyt271.cpp
index 94558fff04..3b81294cfc 100644
--- a/esphome/components/hyt271/hyt271.cpp
+++ b/esphome/components/hyt271/hyt271.cpp
@@ -17,7 +17,7 @@ void HYT271Component::dump_config() {
   LOG_SENSOR("  ", "Humidity", this->humidity_);
 }
 void HYT271Component::update() {
-  uint8_t raw_data[4];
+  uint8_t raw_data[4] = {0, 0, 0, 0};
 
   if (this->write(&raw_data[0], 0) != i2c::ERROR_OK) {
     this->status_set_warning();
diff --git a/esphome/components/ili9xxx/ili9xxx_display.cpp b/esphome/components/ili9xxx/ili9xxx_display.cpp
index fdbf3e3760..902a9e6245 100644
--- a/esphome/components/ili9xxx/ili9xxx_display.cpp
+++ b/esphome/components/ili9xxx/ili9xxx_display.cpp
@@ -180,7 +180,7 @@ void ILI9XXXDisplay::display_() {
 
   ESP_LOGV(TAG,
            "Start display(xlow:%d, ylow:%d, xhigh:%d, yhigh:%d, width:%d, "
-           "heigth:%d, start_pos:%d)",
+           "heigth:%d, start_pos:%" PRId32 ")",
            this->x_low_, this->y_low_, this->x_high_, this->y_high_, w, h, start_pos);
 
   this->start_data_();
diff --git a/esphome/components/ili9xxx/ili9xxx_init.h b/esphome/components/ili9xxx/ili9xxx_init.h
index 031dc25f91..e3be9389b7 100644
--- a/esphome/components/ili9xxx/ili9xxx_init.h
+++ b/esphome/components/ili9xxx/ili9xxx_init.h
@@ -1,6 +1,8 @@
 #pragma once
 #include "esphome/core/helpers.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace ili9xxx {
 
diff --git a/esphome/components/ina219/ina219.cpp b/esphome/components/ina219/ina219.cpp
index 609f3d0f08..2fb3bea356 100644
--- a/esphome/components/ina219/ina219.cpp
+++ b/esphome/components/ina219/ina219.cpp
@@ -122,7 +122,7 @@ void INA219Component::setup() {
 
   this->calibration_lsb_ = lsb;
   auto calibration = uint32_t(0.04096f / (0.000001 * lsb * this->shunt_resistance_ohm_));
-  ESP_LOGV(TAG, "    Using LSB=%u calibration=%u", lsb, calibration);
+  ESP_LOGV(TAG, "    Using LSB=%" PRIu32 " calibration=%" PRIu32, lsb, calibration);
   if (!this->write_byte_16(INA219_REGISTER_CALIBRATION, calibration)) {
     this->mark_failed();
     return;
diff --git a/esphome/components/ina219/ina219.h b/esphome/components/ina219/ina219.h
index 31cd22375e..a6c0f2bc4c 100644
--- a/esphome/components/ina219/ina219.h
+++ b/esphome/components/ina219/ina219.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace ina219 {
 
diff --git a/esphome/components/max31855/max31855.cpp b/esphome/components/max31855/max31855.cpp
index 2578c4742d..445e086ef6 100644
--- a/esphome/components/max31855/max31855.cpp
+++ b/esphome/components/max31855/max31855.cpp
@@ -47,7 +47,7 @@ void MAX31855Sensor::read_data_() {
   if (mem != 0xFFFFFFFF) {
     this->status_clear_error();
   } else {
-    ESP_LOGE(TAG, "No data received from MAX31855 (0x%08X). Check wiring!", mem);
+    ESP_LOGE(TAG, "No data received from MAX31855 (0x%08" PRIX32 "). Check wiring!", mem);
     this->publish_state(NAN);
     if (this->temperature_reference_) {
       this->temperature_reference_->publish_state(NAN);
@@ -69,25 +69,25 @@ void MAX31855Sensor::read_data_() {
 
   // Check thermocouple faults
   if (mem & 0x00000001) {
-    ESP_LOGW(TAG, "Thermocouple open circuit (not connected) fault from MAX31855 (0x%08X)", mem);
+    ESP_LOGW(TAG, "Thermocouple open circuit (not connected) fault from MAX31855 (0x%08" PRIX32 ")", mem);
     this->publish_state(NAN);
     this->status_set_warning();
     return;
   }
   if (mem & 0x00000002) {
-    ESP_LOGW(TAG, "Thermocouple short circuit to ground fault from MAX31855 (0x%08X)", mem);
+    ESP_LOGW(TAG, "Thermocouple short circuit to ground fault from MAX31855 (0x%08" PRIX32 ")", mem);
     this->publish_state(NAN);
     this->status_set_warning();
     return;
   }
   if (mem & 0x00000004) {
-    ESP_LOGW(TAG, "Thermocouple short circuit to VCC fault from MAX31855 (0x%08X)", mem);
+    ESP_LOGW(TAG, "Thermocouple short circuit to VCC fault from MAX31855 (0x%08" PRIX32 ")", mem);
     this->publish_state(NAN);
     this->status_set_warning();
     return;
   }
   if (mem & 0x00010000) {
-    ESP_LOGW(TAG, "Got faulty reading from MAX31855 (0x%08X)", mem);
+    ESP_LOGW(TAG, "Got faulty reading from MAX31855 (0x%08" PRIX32 ")", mem);
     this->publish_state(NAN);
     this->status_set_warning();
     return;
diff --git a/esphome/components/max31855/max31855.h b/esphome/components/max31855/max31855.h
index c0ed8a467d..822e256587 100644
--- a/esphome/components/max31855/max31855.h
+++ b/esphome/components/max31855/max31855.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/spi/spi.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace max31855 {
 
diff --git a/esphome/components/max31856/max31856.cpp b/esphome/components/max31856/max31856.cpp
index 9300916fdc..8ae4be6657 100644
--- a/esphome/components/max31856/max31856.cpp
+++ b/esphome/components/max31856/max31856.cpp
@@ -188,7 +188,7 @@ uint32_t MAX31856Sensor::read_register24_(uint8_t reg) {
   ESP_LOGVV(TAG, "read_byte lsb=0x%02X", lsb);
   this->disable();
   const uint32_t value((msb << 16) | (mid << 8) | lsb);
-  ESP_LOGV(TAG, "read_register_24_ reg=0x%02X: value=0x%06X", reg, value);
+  ESP_LOGV(TAG, "read_register_24_ reg=0x%02X: value=0x%06" PRIX32, reg, value);
   return value;
 }
 
diff --git a/esphome/components/max31856/max31856.h b/esphome/components/max31856/max31856.h
index 157aad433c..4deb6bc855 100644
--- a/esphome/components/max31856/max31856.h
+++ b/esphome/components/max31856/max31856.h
@@ -4,6 +4,8 @@
 #include "esphome/components/spi/spi.h"
 #include "esphome/core/component.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace max31856 {
 
diff --git a/esphome/components/mitsubishi/mitsubishi.cpp b/esphome/components/mitsubishi/mitsubishi.cpp
index 99ca6d1cc5..87b78128e4 100644
--- a/esphome/components/mitsubishi/mitsubishi.cpp
+++ b/esphome/components/mitsubishi/mitsubishi.cpp
@@ -45,8 +45,8 @@ void MitsubishiClimate::transmit_state() {
   remote_state[7] = (uint8_t) roundf(clamp<float>(this->target_temperature, MITSUBISHI_TEMP_MIN, MITSUBISHI_TEMP_MAX) -
                                      MITSUBISHI_TEMP_MIN);
 
-  ESP_LOGV(TAG, "Sending Mitsubishi target temp: %.1f state: %02X mode: %02X temp: %02X", this->target_temperature,
-           remote_state[5], remote_state[6], remote_state[7]);
+  ESP_LOGV(TAG, "Sending Mitsubishi target temp: %.1f state: %02" PRIX32 " mode: %02" PRIX32 " temp: %02" PRIX32,
+           this->target_temperature, remote_state[5], remote_state[6], remote_state[7]);
 
   // Checksum
   for (int i = 0; i < 17; i++) {
diff --git a/esphome/components/mitsubishi/mitsubishi.h b/esphome/components/mitsubishi/mitsubishi.h
index e6bd7b8ebe..9a88040d3f 100644
--- a/esphome/components/mitsubishi/mitsubishi.h
+++ b/esphome/components/mitsubishi/mitsubishi.h
@@ -2,6 +2,8 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace mitsubishi {
 
diff --git a/esphome/components/ota/__init__.py b/esphome/components/ota/__init__.py
index eb2a83272d..039596d897 100644
--- a/esphome/components/ota/__init__.py
+++ b/esphome/components/ota/__init__.py
@@ -128,7 +128,7 @@ async def to_code(config):
         use_state_callback = True
     for conf in config.get(CONF_ON_ERROR, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
-        await automation.build_automation(trigger, [(int, "x")], conf)
+        await automation.build_automation(trigger, [(cg.uint8, "x")], conf)
         use_state_callback = True
     if use_state_callback:
         cg.add_define("USE_OTA_STATE_CALLBACK")
diff --git a/esphome/components/ota/automation.h b/esphome/components/ota/automation.h
index 6c8aca3705..0c77a18ce1 100644
--- a/esphome/components/ota/automation.h
+++ b/esphome/components/ota/automation.h
@@ -54,7 +54,7 @@ class OTAEndTrigger : public Trigger<> {
   }
 };
 
-class OTAErrorTrigger : public Trigger<int> {
+class OTAErrorTrigger : public Trigger<uint8_t> {
  public:
   explicit OTAErrorTrigger(OTAComponent *parent) {
     parent->add_on_state_callback([this, parent](OTAState state, float progress, uint8_t error) {
diff --git a/esphome/components/power_supply/power_supply.cpp b/esphome/components/power_supply/power_supply.cpp
index a492919202..c4d157615a 100644
--- a/esphome/components/power_supply/power_supply.cpp
+++ b/esphome/components/power_supply/power_supply.cpp
@@ -16,7 +16,7 @@ void PowerSupply::setup() {
 void PowerSupply::dump_config() {
   ESP_LOGCONFIG(TAG, "Power Supply:");
   LOG_PIN("  Pin: ", this->pin_);
-  ESP_LOGCONFIG(TAG, "  Time to enable: %u ms", this->enable_time_);
+  ESP_LOGCONFIG(TAG, "  Time to enable: %" PRIu32 " ms", this->enable_time_);
   ESP_LOGCONFIG(TAG, "  Keep on time: %.1f s", this->keep_on_time_ / 1000.0f);
 }
 
diff --git a/esphome/components/power_supply/power_supply.h b/esphome/components/power_supply/power_supply.h
index 66e4a7565a..49d905ba3a 100644
--- a/esphome/components/power_supply/power_supply.h
+++ b/esphome/components/power_supply/power_supply.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/hal.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace power_supply {
 
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.cpp b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
index 1f50360fed..281a61a66a 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.cpp
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.cpp
@@ -104,7 +104,7 @@ bool HwPulseCounterStorage::pulse_counter_setup(InternalGPIOPin *pin) {
 
   if (this->filter_us != 0) {
     uint16_t filter_val = std::min(static_cast<unsigned int>(this->filter_us * 80u), 1023u);
-    ESP_LOGCONFIG(TAG, "    Filter Value: %uus (val=%u)", this->filter_us, filter_val);
+    ESP_LOGCONFIG(TAG, "    Filter Value: %" PRIu32 "us (val=%u)", this->filter_us, filter_val);
     error = pcnt_set_filter_value(this->pcnt_unit, filter_val);
     if (error != ESP_OK) {
       ESP_LOGE(TAG, "Setting filter value failed: %s", esp_err_to_name(error));
@@ -161,7 +161,7 @@ void PulseCounterSensor::dump_config() {
   LOG_PIN("  Pin: ", this->pin_);
   ESP_LOGCONFIG(TAG, "  Rising Edge: %s", EDGE_MODE_TO_STRING[this->storage_.rising_edge_mode]);
   ESP_LOGCONFIG(TAG, "  Falling Edge: %s", EDGE_MODE_TO_STRING[this->storage_.falling_edge_mode]);
-  ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %u µs", this->storage_.filter_us);
+  ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %" PRIu32 " µs", this->storage_.filter_us);
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -177,7 +177,7 @@ void PulseCounterSensor::update() {
 
   if (this->total_sensor_ != nullptr) {
     current_total_ += raw;
-    ESP_LOGD(TAG, "'%s': Total : %i pulses", this->get_name().c_str(), current_total_);
+    ESP_LOGD(TAG, "'%s': Total : %" PRIu32 " pulses", this->get_name().c_str(), current_total_);
     this->total_sensor_->publish_state(current_total_);
   }
   this->last_time_ = now;
diff --git a/esphome/components/pulse_counter/pulse_counter_sensor.h b/esphome/components/pulse_counter/pulse_counter_sensor.h
index ef944f106f..ef9f73f95c 100644
--- a/esphome/components/pulse_counter/pulse_counter_sensor.h
+++ b/esphome/components/pulse_counter/pulse_counter_sensor.h
@@ -4,6 +4,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <cinttypes>
+
 #if defined(USE_ESP32) && !defined(USE_ESP32_VARIANT_ESP32C3)
 #include <driver/pcnt.h>
 #define HAS_PCNT
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.cpp b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
index be5fad6fe5..6c4ebe002e 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.cpp
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
@@ -61,12 +61,13 @@ void PulseMeterSensor::loop() {
     const uint32_t time_since_valid_edge_us = now - this->last_processed_edge_us_;
 
     switch (this->meter_state_) {
-        // Running and initial states can timeout
+      // Running and initial states can timeout
       case MeterState::INITIAL:
       case MeterState::RUNNING: {
         if (time_since_valid_edge_us > this->timeout_us_) {
           this->meter_state_ = MeterState::TIMED_OUT;
-          ESP_LOGD(TAG, "No pulse detected for %us, assuming 0 pulses/min", time_since_valid_edge_us / 1000000);
+          ESP_LOGD(TAG, "No pulse detected for %" PRIu32 "s, assuming 0 pulses/min",
+                   time_since_valid_edge_us / 1000000);
           this->publish_state(0.0f);
         }
       } break;
@@ -82,11 +83,12 @@ void PulseMeterSensor::dump_config() {
   LOG_SENSOR("", "Pulse Meter", this);
   LOG_PIN("  Pin: ", this->pin_);
   if (this->filter_mode_ == FILTER_EDGE) {
-    ESP_LOGCONFIG(TAG, "  Filtering rising edges less than %u µs apart", this->filter_us_);
+    ESP_LOGCONFIG(TAG, "  Filtering rising edges less than %" PRIu32 " µs apart", this->filter_us_);
   } else {
-    ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %u µs", this->filter_us_);
+    ESP_LOGCONFIG(TAG, "  Filtering pulses shorter than %" PRIu32 " µs", this->filter_us_);
   }
-  ESP_LOGCONFIG(TAG, "  Assuming 0 pulses/min after not receiving a pulse for %us", this->timeout_us_ / 1000000);
+  ESP_LOGCONFIG(TAG, "  Assuming 0 pulses/min after not receiving a pulse for %" PRIu32 "s",
+                this->timeout_us_ / 1000000);
 }
 
 void IRAM_ATTR PulseMeterSensor::edge_intr(PulseMeterSensor *sensor) {
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index f376ea48a5..fc8d47538f 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -5,6 +5,8 @@
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace pulse_meter {
 
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
index 384537e5d7..fc200f7d71 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.cpp
@@ -14,7 +14,7 @@ void PVVXDisplay::dump_config() {
   ESP_LOGCONFIG(TAG, "  Characteristic UUID   : %s", this->char_uuid_.to_string().c_str());
   ESP_LOGCONFIG(TAG, "  Auto clear            : %s", YESNO(this->auto_clear_enabled_));
   ESP_LOGCONFIG(TAG, "  Set time on connection: %s", YESNO(this->time_ != nullptr));
-  ESP_LOGCONFIG(TAG, "  Disconnect delay      : %dms", this->disconnect_delay_ms_);
+  ESP_LOGCONFIG(TAG, "  Disconnect delay      : %" PRIu32 "ms", this->disconnect_delay_ms_);
   LOG_UPDATE_INTERVAL(this);
 }
 
@@ -139,7 +139,11 @@ void PVVXDisplay::sync_time_() {
   }
   time.recalc_timestamp_utc(true);  // calculate timestamp of local time
   uint8_t blk[5] = {};
+#if ESP_IDF_VERSION_MAJOR >= 5
+  ESP_LOGD(TAG, "[%s] Sync time with timestamp %" PRIu64 ".", this->parent_->address_str().c_str(), time.timestamp);
+#else
   ESP_LOGD(TAG, "[%s] Sync time with timestamp %lu.", this->parent_->address_str().c_str(), time.timestamp);
+#endif
   blk[0] = 0x23;
   blk[1] = time.timestamp & 0xff;
   blk[2] = (time.timestamp >> 8) & 0xff;
diff --git a/esphome/components/pvvx_mithermometer/display/pvvx_display.h b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
index c7e7cc04fb..dfeb49c49d 100644
--- a/esphome/components/pvvx_mithermometer/display/pvvx_display.h
+++ b/esphome/components/pvvx_mithermometer/display/pvvx_display.h
@@ -4,6 +4,8 @@
 #include "esphome/core/defines.h"
 #include "esphome/components/ble_client/ble_client.h"
 
+#include <cinttypes>
+
 #ifdef USE_ESP32
 #include <esp_gattc_api.h>
 #ifdef USE_TIME
diff --git a/esphome/components/rdm6300/rdm6300.cpp b/esphome/components/rdm6300/rdm6300.cpp
index 434b9f5720..bfdd880079 100644
--- a/esphome/components/rdm6300/rdm6300.cpp
+++ b/esphome/components/rdm6300/rdm6300.cpp
@@ -57,7 +57,7 @@ void rdm6300::RDM6300Component::loop() {
           trig->process(result);
 
         if (report) {
-          ESP_LOGD(TAG, "Found new tag with ID %u", result);
+          ESP_LOGD(TAG, "Found new tag with ID %" PRIu32, result);
         }
       }
     }
diff --git a/esphome/components/rdm6300/rdm6300.h b/esphome/components/rdm6300/rdm6300.h
index 0aeabef2bc..1a1a0c0cd6 100644
--- a/esphome/components/rdm6300/rdm6300.h
+++ b/esphome/components/rdm6300/rdm6300.h
@@ -5,6 +5,7 @@
 #include "esphome/components/binary_sensor/binary_sensor.h"
 #include "esphome/components/uart/uart.h"
 
+#include <cinttypes>
 #include <vector>
 
 namespace esphome {
diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index 5a703066a1..cf2ae89b6a 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -372,19 +372,14 @@ def coolix_binary_sensor(var, config):
     if isinstance(config, dict):
         cg.add(
             var.set_data(
-                cg.StructInitializer(
-                    CoolixData,
-                    ("first", config[CONF_FIRST]),
-                    ("second", config[CONF_SECOND]),
+                cg.ArrayInitializer(
+                    config[CONF_FIRST],
+                    config[CONF_SECOND],
                 )
             )
         )
     else:
-        cg.add(
-            var.set_data(
-                cg.StructInitializer(CoolixData, ("first", 0), ("second", config))
-            )
-        )
+        cg.add(var.set_data(cg.ArrayInitializer(0, config)))
 
 
 @register_action("coolix", CoolixAction, COOLIX_BASE_SCHEMA)
diff --git a/esphome/components/remote_base/coolix_protocol.cpp b/esphome/components/remote_base/coolix_protocol.cpp
index 295fccb762..21a9f598b7 100644
--- a/esphome/components/remote_base/coolix_protocol.cpp
+++ b/esphome/components/remote_base/coolix_protocol.cpp
@@ -101,11 +101,11 @@ optional<CoolixData> CoolixProtocol::decode(RemoteReceiveData data) {
 
 void CoolixProtocol::dump(const CoolixData &data) {
   if (data.is_strict()) {
-    ESP_LOGI(TAG, "Received Coolix: 0x%06X", data.first);
+    ESP_LOGI(TAG, "Received Coolix: 0x%06" PRIX32, data.first);
   } else if (data.has_second()) {
-    ESP_LOGI(TAG, "Received unstrict Coolix: [0x%06X, 0x%06X]", data.first, data.second);
+    ESP_LOGI(TAG, "Received unstrict Coolix: [0x%06" PRIX32 ", 0x%06" PRIX32 "]", data.first, data.second);
   } else {
-    ESP_LOGI(TAG, "Received unstrict Coolix: [0x%06X]", data.first);
+    ESP_LOGI(TAG, "Received unstrict Coolix: [0x%06" PRIX32 "]", data.first);
   }
 }
 
diff --git a/esphome/components/remote_base/coolix_protocol.h b/esphome/components/remote_base/coolix_protocol.h
index 50ac839200..b66415ff70 100644
--- a/esphome/components/remote_base/coolix_protocol.h
+++ b/esphome/components/remote_base/coolix_protocol.h
@@ -4,6 +4,8 @@
 #include "esphome/core/helpers.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/drayton_protocol.cpp b/esphome/components/remote_base/drayton_protocol.cpp
index 56a3dec1e0..12a553455f 100644
--- a/esphome/components/remote_base/drayton_protocol.cpp
+++ b/esphome/components/remote_base/drayton_protocol.cpp
@@ -114,7 +114,7 @@ void DraytonProtocol::encode(RemoteTransmitData *dst, const DraytonData &data) {
   out_data <<= NBITS_CHANNEL;
   out_data |= data.channel;
 
-  ESP_LOGV(TAG, "Send Drayton: out_data %08x", out_data);
+  ESP_LOGV(TAG, "Send Drayton: out_data %08" PRIx32, out_data);
 
   for (uint32_t mask = 1UL << (NBITS - 1); mask != 0; mask >>= 1) {
     if (out_data & mask) {
@@ -169,7 +169,7 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
              (src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US))) {
     out_data |= 1 << bit;
   } else {
-    ESP_LOGV(TAG, "Decode Drayton: Fail 1, - %d", src.get_index());
+    ESP_LOGV(TAG, "Decode Drayton: Fail 1, - %" PRIu32, src.get_index());
     return {};
   }
 
@@ -194,7 +194,7 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
   } else if (src.expect_mark(BIT_TIME_US) || src.expect_mark(2 * BIT_TIME_US)) {
     out_data |= 1;
   }
-  ESP_LOGV(TAG, "Decode Drayton: Data, %2d %08x", bit, out_data);
+  ESP_LOGV(TAG, "Decode Drayton: Data, %2d %08" PRIx32, bit, out_data);
 
   out.channel = (uint8_t) (out_data & 0x1F);
   out_data >>= NBITS_CHANNEL;
diff --git a/esphome/components/remote_base/drayton_protocol.h b/esphome/components/remote_base/drayton_protocol.h
index f468e7b57e..75213b9186 100644
--- a/esphome/components/remote_base/drayton_protocol.h
+++ b/esphome/components/remote_base/drayton_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/jvc_protocol.cpp b/esphome/components/remote_base/jvc_protocol.cpp
index 3d34cc614e..ca423b61e6 100644
--- a/esphome/components/remote_base/jvc_protocol.cpp
+++ b/esphome/components/remote_base/jvc_protocol.cpp
@@ -46,7 +46,7 @@ optional<JVCData> JVCProtocol::decode(RemoteReceiveData src) {
   }
   return out;
 }
-void JVCProtocol::dump(const JVCData &data) { ESP_LOGI(TAG, "Received JVC: data=0x%04X", data.data); }
+void JVCProtocol::dump(const JVCData &data) { ESP_LOGI(TAG, "Received JVC: data=0x%04" PRIX32, data.data); }
 
 }  // namespace remote_base
 }  // namespace esphome
diff --git a/esphome/components/remote_base/jvc_protocol.h b/esphome/components/remote_base/jvc_protocol.h
index fc40a6a874..a17e593ad2 100644
--- a/esphome/components/remote_base/jvc_protocol.h
+++ b/esphome/components/remote_base/jvc_protocol.h
@@ -2,6 +2,8 @@
 
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/lg_protocol.cpp b/esphome/components/remote_base/lg_protocol.cpp
index d7d3a5ac7d..d25c59d2b1 100644
--- a/esphome/components/remote_base/lg_protocol.cpp
+++ b/esphome/components/remote_base/lg_protocol.cpp
@@ -51,7 +51,7 @@ optional<LGData> LGProtocol::decode(RemoteReceiveData src) {
   return out;
 }
 void LGProtocol::dump(const LGData &data) {
-  ESP_LOGI(TAG, "Received LG: data=0x%08X, nbits=%d", data.data, data.nbits);
+  ESP_LOGI(TAG, "Received LG: data=0x%08" PRIX32 ", nbits=%d", data.data, data.nbits);
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/remote_base/lg_protocol.h b/esphome/components/remote_base/lg_protocol.h
index 6267560443..e0039d033d 100644
--- a/esphome/components/remote_base/lg_protocol.h
+++ b/esphome/components/remote_base/lg_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/magiquest_protocol.cpp b/esphome/components/remote_base/magiquest_protocol.cpp
index 76024b1eaf..1cec58a55f 100644
--- a/esphome/components/remote_base/magiquest_protocol.cpp
+++ b/esphome/components/remote_base/magiquest_protocol.cpp
@@ -76,7 +76,7 @@ optional<MagiQuestData> MagiQuestProtocol::decode(RemoteReceiveData src) {
   return data;
 }
 void MagiQuestProtocol::dump(const MagiQuestData &data) {
-  ESP_LOGI(TAG, "Received MagiQuest: wand_id=0x%08X, magnitude=0x%04X", data.wand_id, data.magnitude);
+  ESP_LOGI(TAG, "Received MagiQuest: wand_id=0x%08" PRIX32 ", magnitude=0x%04X", data.wand_id, data.magnitude);
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/remote_base/magiquest_protocol.h b/esphome/components/remote_base/magiquest_protocol.h
index 909be346d0..a531a9aee1 100644
--- a/esphome/components/remote_base/magiquest_protocol.h
+++ b/esphome/components/remote_base/magiquest_protocol.h
@@ -2,6 +2,8 @@
 
 #include "remote_base.h"
 
+#include <cinttypes>
+
 /* Based on protocol analysis from
  * https://arduino-irremote.github.io/Arduino-IRremote/ir__MagiQuest_8cpp_source.html
  */
diff --git a/esphome/components/remote_base/nexa_protocol.cpp b/esphome/components/remote_base/nexa_protocol.cpp
index f4e7d14187..862165714e 100644
--- a/esphome/components/remote_base/nexa_protocol.cpp
+++ b/esphome/components/remote_base/nexa_protocol.cpp
@@ -232,7 +232,7 @@ optional<NexaData> NexaProtocol::decode(RemoteReceiveData src) {
 }
 
 void NexaProtocol::dump(const NexaData &data) {
-  ESP_LOGI(TAG, "Received NEXA: device=0x%04X group=%d state=%d channel=%d level=%d", data.device, data.group,
+  ESP_LOGI(TAG, "Received NEXA: device=0x%04" PRIX32 " group=%d state=%d channel=%d level=%d", data.device, data.group,
            data.state, data.channel, data.level);
 }
 
diff --git a/esphome/components/remote_base/nexa_protocol.h b/esphome/components/remote_base/nexa_protocol.h
index f1ce380780..4d9443ce0e 100644
--- a/esphome/components/remote_base/nexa_protocol.h
+++ b/esphome/components/remote_base/nexa_protocol.h
@@ -2,6 +2,8 @@
 
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/panasonic_protocol.cpp b/esphome/components/remote_base/panasonic_protocol.cpp
index 460ca3b164..d6cf1a160d 100644
--- a/esphome/components/remote_base/panasonic_protocol.cpp
+++ b/esphome/components/remote_base/panasonic_protocol.cpp
@@ -67,7 +67,7 @@ optional<PanasonicData> PanasonicProtocol::decode(RemoteReceiveData src) {
   return out;
 }
 void PanasonicProtocol::dump(const PanasonicData &data) {
-  ESP_LOGI(TAG, "Received Panasonic: address=0x%04X, command=0x%08X", data.address, data.command);
+  ESP_LOGI(TAG, "Received Panasonic: address=0x%04X, command=0x%08" PRIX32, data.address, data.command);
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/remote_base/panasonic_protocol.h b/esphome/components/remote_base/panasonic_protocol.h
index eae97a8a14..c81366138a 100644
--- a/esphome/components/remote_base/panasonic_protocol.h
+++ b/esphome/components/remote_base/panasonic_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/raw_protocol.cpp b/esphome/components/remote_base/raw_protocol.cpp
index 9304aa3e3d..bdeb935dc4 100644
--- a/esphome/components/remote_base/raw_protocol.cpp
+++ b/esphome/components/remote_base/raw_protocol.cpp
@@ -17,9 +17,9 @@ bool RawDumper::dump(RemoteReceiveData src) {
     int written;
 
     if (i + 1 < src.size() - 1) {
-      written = snprintf(buffer + buffer_offset, remaining_length, "%d, ", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32 ", ", value);
     } else {
-      written = snprintf(buffer + buffer_offset, remaining_length, "%d", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32, value);
     }
 
     if (written < 0 || written >= int(remaining_length)) {
@@ -29,9 +29,9 @@ bool RawDumper::dump(RemoteReceiveData src) {
       buffer_offset = 0;
       written = sprintf(buffer, "  ");
       if (i + 1 < src.size()) {
-        written += sprintf(buffer + written, "%d, ", value);
+        written += sprintf(buffer + written, "%" PRId32 ", ", value);
       } else {
-        written += sprintf(buffer + written, "%d", value);
+        written += sprintf(buffer + written, "%" PRId32, value);
       }
     }
 
diff --git a/esphome/components/remote_base/raw_protocol.h b/esphome/components/remote_base/raw_protocol.h
index 494903daa8..9b671e611f 100644
--- a/esphome/components/remote_base/raw_protocol.h
+++ b/esphome/components/remote_base/raw_protocol.h
@@ -3,6 +3,7 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
 #include <vector>
 
 namespace esphome {
diff --git a/esphome/components/remote_base/samsung36_protocol.cpp b/esphome/components/remote_base/samsung36_protocol.cpp
index 2396986670..bd3eee5849 100644
--- a/esphome/components/remote_base/samsung36_protocol.cpp
+++ b/esphome/components/remote_base/samsung36_protocol.cpp
@@ -96,7 +96,7 @@ optional<Samsung36Data> Samsung36Protocol::decode(RemoteReceiveData src) {
   return out;
 }
 void Samsung36Protocol::dump(const Samsung36Data &data) {
-  ESP_LOGI(TAG, "Received Samsung36: address=0x%04X, command=0x%08X", data.address, data.command);
+  ESP_LOGI(TAG, "Received Samsung36: address=0x%04X, command=0x%08" PRIX32, data.address, data.command);
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/remote_base/samsung36_protocol.h b/esphome/components/remote_base/samsung36_protocol.h
index 4ba6226edd..aa7fd21609 100644
--- a/esphome/components/remote_base/samsung36_protocol.h
+++ b/esphome/components/remote_base/samsung36_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_base/sony_protocol.cpp b/esphome/components/remote_base/sony_protocol.cpp
index bcd8e4c8cf..69f2b49c42 100644
--- a/esphome/components/remote_base/sony_protocol.cpp
+++ b/esphome/components/remote_base/sony_protocol.cpp
@@ -62,7 +62,7 @@ optional<SonyData> SonyProtocol::decode(RemoteReceiveData src) {
   return out;
 }
 void SonyProtocol::dump(const SonyData &data) {
-  ESP_LOGI(TAG, "Received Sony: data=0x%08X, nbits=%d", data.data, data.nbits);
+  ESP_LOGI(TAG, "Received Sony: data=0x%08" PRIX32 ", nbits=%d", data.data, data.nbits);
 }
 
 }  // namespace remote_base
diff --git a/esphome/components/remote_base/sony_protocol.h b/esphome/components/remote_base/sony_protocol.h
index aecc8ab91c..d9e4f37d53 100644
--- a/esphome/components/remote_base/sony_protocol.h
+++ b/esphome/components/remote_base/sony_protocol.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_base {
 
diff --git a/esphome/components/remote_receiver/remote_receiver.h b/esphome/components/remote_receiver/remote_receiver.h
index 82c66e3cd0..c1343a8603 100644
--- a/esphome/components/remote_receiver/remote_receiver.h
+++ b/esphome/components/remote_receiver/remote_receiver.h
@@ -3,6 +3,8 @@
 #include "esphome/core/component.h"
 #include "esphome/components/remote_base/remote_base.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace remote_receiver {
 
diff --git a/esphome/components/remote_receiver/remote_receiver_esp32.cpp b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
index 5a7fb3c985..1ebb5a5955 100644
--- a/esphome/components/remote_receiver/remote_receiver_esp32.cpp
+++ b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
@@ -62,7 +62,7 @@ void RemoteReceiverComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "  Clock divider: %u", this->clock_divider_);
   ESP_LOGCONFIG(TAG, "  Tolerance: %u%%", this->tolerance_);
   ESP_LOGCONFIG(TAG, "  Filter out pulses shorter than: %u us", this->filter_us_);
-  ESP_LOGCONFIG(TAG, "  Signal is done after %u us of no changes", this->idle_us_);
+  ESP_LOGCONFIG(TAG, "  Signal is done after %" PRIu32 " us of no changes", this->idle_us_);
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Configuring RMT driver failed: %s", esp_err_to_name(this->error_code_));
   }
diff --git a/esphome/components/sgp30/sgp30.cpp b/esphome/components/sgp30/sgp30.cpp
index 25a3c1ab8f..0910a32a35 100644
--- a/esphome/components/sgp30/sgp30.cpp
+++ b/esphome/components/sgp30/sgp30.cpp
@@ -255,7 +255,7 @@ void SGP30Component::dump_config() {
     } else {
       ESP_LOGCONFIG(TAG, "  Baseline: No baseline configured");
     }
-    ESP_LOGCONFIG(TAG, "  Warm up time: %us", this->required_warm_up_time_);
+    ESP_LOGCONFIG(TAG, "  Warm up time: %" PRIu32 "s", this->required_warm_up_time_);
   }
   LOG_UPDATE_INTERVAL(this);
   LOG_SENSOR("  ", "eCO2 sensor", this->eco2_sensor_);
diff --git a/esphome/components/sgp30/sgp30.h b/esphome/components/sgp30/sgp30.h
index d61eee00db..9e882e6b05 100644
--- a/esphome/components/sgp30/sgp30.h
+++ b/esphome/components/sgp30/sgp30.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/sensirion_common/i2c_sensirion.h"
 #include "esphome/core/preferences.h"
+
+#include <cinttypes>
 #include <cmath>
 
 namespace esphome {
diff --git a/esphome/components/sht3xd/sht3xd.cpp b/esphome/components/sht3xd/sht3xd.cpp
index f4bd2da271..25332165c0 100644
--- a/esphome/components/sht3xd/sht3xd.cpp
+++ b/esphome/components/sht3xd/sht3xd.cpp
@@ -27,7 +27,7 @@ void SHT3XDComponent::setup() {
     return;
   }
   uint32_t serial_number = (uint32_t(raw_serial_number[0]) << 16) | uint32_t(raw_serial_number[1]);
-  ESP_LOGV(TAG, "    Serial Number: 0x%08X", serial_number);
+  ESP_LOGV(TAG, "    Serial Number: 0x%08" PRIX32, serial_number);
 }
 void SHT3XDComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "SHT3xD:");
diff --git a/esphome/components/sht3xd/sht3xd.h b/esphome/components/sht3xd/sht3xd.h
index 04023c8a46..4133bf7b93 100644
--- a/esphome/components/sht3xd/sht3xd.h
+++ b/esphome/components/sht3xd/sht3xd.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/sensirion_common/i2c_sensirion.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace sht3xd {
 
diff --git a/esphome/components/sht4x/sht4x.cpp b/esphome/components/sht4x/sht4x.cpp
index 0f9123434d..dea542ea9e 100644
--- a/esphome/components/sht4x/sht4x.cpp
+++ b/esphome/components/sht4x/sht4x.cpp
@@ -20,7 +20,7 @@ void SHT4XComponent::setup() {
 
   if (this->duty_cycle_ > 0.0) {
     uint32_t heater_interval = (uint32_t) (this->heater_time_ / this->duty_cycle_);
-    ESP_LOGD(TAG, "Heater interval: %i", heater_interval);
+    ESP_LOGD(TAG, "Heater interval: %" PRIu32, heater_interval);
 
     if (this->heater_power_ == SHT4X_HEATERPOWER_HIGH) {
       if (this->heater_time_ == SHT4X_HEATERTIME_LONG) {
diff --git a/esphome/components/sht4x/sht4x.h b/esphome/components/sht4x/sht4x.h
index 01553d5c15..46037bb0e8 100644
--- a/esphome/components/sht4x/sht4x.h
+++ b/esphome/components/sht4x/sht4x.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/sensirion_common/i2c_sensirion.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace sht4x {
 
diff --git a/esphome/components/sts3x/sts3x.cpp b/esphome/components/sts3x/sts3x.cpp
index 5af808b6e7..a533bc1d87 100644
--- a/esphome/components/sts3x/sts3x.cpp
+++ b/esphome/components/sts3x/sts3x.cpp
@@ -30,7 +30,7 @@ void STS3XComponent::setup() {
     return;
   }
   uint32_t serial_number = (uint32_t(raw_serial_number[0]) << 16);
-  ESP_LOGV(TAG, "    Serial Number: 0x%08X", serial_number);
+  ESP_LOGV(TAG, "    Serial Number: 0x%08" PRIX32, serial_number);
 }
 void STS3XComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "STS3x:");
diff --git a/esphome/components/sts3x/sts3x.h b/esphome/components/sts3x/sts3x.h
index 261033efad..8f806a3471 100644
--- a/esphome/components/sts3x/sts3x.h
+++ b/esphome/components/sts3x/sts3x.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/sensirion_common/i2c_sensirion.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace sts3x {
 
diff --git a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
index da56976b56..b39b587811 100644
--- a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
+++ b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.cpp
@@ -26,14 +26,14 @@ void TemplateAlarmControlPanel::dump_config() {
   ESP_LOGCONFIG(TAG, "  Number of Codes: %u", this->codes_.size());
   if (!this->codes_.empty())
     ESP_LOGCONFIG(TAG, "  Requires Code To Arm: %s", YESNO(this->requires_code_to_arm_));
-  ESP_LOGCONFIG(TAG, "  Arming Away Time: %us", (this->arming_away_time_ / 1000));
+  ESP_LOGCONFIG(TAG, "  Arming Away Time: %" PRIu32 "s", (this->arming_away_time_ / 1000));
   if (this->arming_home_time_ != 0)
-    ESP_LOGCONFIG(TAG, "  Arming Home Time: %us", (this->arming_home_time_ / 1000));
+    ESP_LOGCONFIG(TAG, "  Arming Home Time: %" PRIu32 "s", (this->arming_home_time_ / 1000));
   if (this->arming_night_time_ != 0)
-    ESP_LOGCONFIG(TAG, "  Arming Night Time: %us", (this->arming_night_time_ / 1000));
-  ESP_LOGCONFIG(TAG, "  Pending Time: %us", (this->pending_time_ / 1000));
-  ESP_LOGCONFIG(TAG, "  Trigger Time: %us", (this->trigger_time_ / 1000));
-  ESP_LOGCONFIG(TAG, "  Supported Features: %u", this->get_supported_features());
+    ESP_LOGCONFIG(TAG, "  Arming Night Time: %" PRIu32 "s", (this->arming_night_time_ / 1000));
+  ESP_LOGCONFIG(TAG, "  Pending Time: %" PRIu32 "s", (this->pending_time_ / 1000));
+  ESP_LOGCONFIG(TAG, "  Trigger Time: %" PRIu32 "s", (this->trigger_time_ / 1000));
+  ESP_LOGCONFIG(TAG, "  Supported Features: %" PRIu32, this->get_supported_features());
 #ifdef USE_BINARY_SENSOR
   for (auto sensor_pair : this->sensor_map_) {
     ESP_LOGCONFIG(TAG, "  Binary Sesnsor:");
diff --git a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
index ebd8696692..9582ed157c 100644
--- a/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
+++ b/esphome/components/template/alarm_control_panel/template_alarm_control_panel.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cinttypes>
 #include <map>
 
 #include "esphome/core/automation.h"
diff --git a/esphome/components/tsl2591/tsl2591.cpp b/esphome/components/tsl2591/tsl2591.cpp
index 5086a38408..977048364c 100644
--- a/esphome/components/tsl2591/tsl2591.cpp
+++ b/esphome/components/tsl2591/tsl2591.cpp
@@ -142,8 +142,8 @@ void TSL2591Component::process_update_() {
   uint16_t full = this->get_illuminance(TSL2591_SENSOR_CHANNEL_FULL_SPECTRUM, combined);
   float lux = this->get_calculated_lux(full, infrared);
   uint16_t actual_gain = this->get_actual_gain();
-  ESP_LOGD(TAG, "Got illuminance: combined 0x%X, full %d, IR %d, vis %d. Calc lux: %f. Actual gain: %d.", combined,
-           full, infrared, visible, lux, actual_gain);
+  ESP_LOGD(TAG, "Got illuminance: combined 0x%" PRIX32 ", full %d, IR %d, vis %d. Calc lux: %f. Actual gain: %d.",
+           combined, full, infrared, visible, lux, actual_gain);
   if (this->full_spectrum_sensor_ != nullptr) {
     this->full_spectrum_sensor_->publish_state(full);
   }
diff --git a/esphome/components/tsl2591/tsl2591.h b/esphome/components/tsl2591/tsl2591.h
index d7c5230276..fa302b14b0 100644
--- a/esphome/components/tsl2591/tsl2591.h
+++ b/esphome/components/tsl2591/tsl2591.h
@@ -4,6 +4,8 @@
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/i2c/i2c.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace tsl2591 {
 
diff --git a/esphome/components/uart/switch/uart_switch.cpp b/esphome/components/uart/switch/uart_switch.cpp
index b995aca98c..1edb54641b 100644
--- a/esphome/components/uart/switch/uart_switch.cpp
+++ b/esphome/components/uart/switch/uart_switch.cpp
@@ -53,7 +53,7 @@ void UARTSwitch::write_state(bool state) {
 void UARTSwitch::dump_config() {
   LOG_SWITCH("", "UART Switch", this);
   if (this->send_every_) {
-    ESP_LOGCONFIG(TAG, "  Send Every: %u", this->send_every_);
+    ESP_LOGCONFIG(TAG, "  Send Every: %" PRIu32, this->send_every_);
   }
 }
 
diff --git a/esphome/components/uart/switch/uart_switch.h b/esphome/components/uart/switch/uart_switch.h
index eb3d697a58..4ef5b6da4b 100644
--- a/esphome/components/uart/switch/uart_switch.h
+++ b/esphome/components/uart/switch/uart_switch.h
@@ -4,6 +4,7 @@
 #include "esphome/components/uart/uart.h"
 #include "esphome/components/switch/switch.h"
 
+#include <cinttypes>
 #include <vector>
 
 namespace esphome {
diff --git a/esphome/components/ultrasonic/ultrasonic_sensor.cpp b/esphome/components/ultrasonic/ultrasonic_sensor.cpp
index dc828aed6b..604e78d6f8 100644
--- a/esphome/components/ultrasonic/ultrasonic_sensor.cpp
+++ b/esphome/components/ultrasonic/ultrasonic_sensor.cpp
@@ -30,7 +30,7 @@ void UltrasonicSensorComponent::update() {
     ;
   const uint32_t pulse_end = micros();
 
-  ESP_LOGV(TAG, "Echo took %uµs", pulse_end - pulse_start);
+  ESP_LOGV(TAG, "Echo took %" PRIu32 "µs", pulse_end - pulse_start);
 
   if (pulse_end - start >= timeout_us_) {
     ESP_LOGD(TAG, "'%s' - Distance measurement timed out!", this->name_.c_str());
@@ -45,8 +45,8 @@ void UltrasonicSensorComponent::dump_config() {
   LOG_SENSOR("", "Ultrasonic Sensor", this);
   LOG_PIN("  Echo Pin: ", this->echo_pin_);
   LOG_PIN("  Trigger Pin: ", this->trigger_pin_);
-  ESP_LOGCONFIG(TAG, "  Pulse time: %u µs", this->pulse_time_us_);
-  ESP_LOGCONFIG(TAG, "  Timeout: %u µs", this->timeout_us_);
+  ESP_LOGCONFIG(TAG, "  Pulse time: %" PRIu32 " µs", this->pulse_time_us_);
+  ESP_LOGCONFIG(TAG, "  Timeout: %" PRIu32 " µs", this->timeout_us_);
   LOG_UPDATE_INTERVAL(this);
 }
 float UltrasonicSensorComponent::us_to_m(uint32_t us) {
diff --git a/esphome/components/ultrasonic/ultrasonic_sensor.h b/esphome/components/ultrasonic/ultrasonic_sensor.h
index e0d71b99ef..1a255d6122 100644
--- a/esphome/components/ultrasonic/ultrasonic_sensor.h
+++ b/esphome/components/ultrasonic/ultrasonic_sensor.h
@@ -4,6 +4,8 @@
 #include "esphome/core/gpio.h"
 #include "esphome/components/sensor/sensor.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace ultrasonic {
 
diff --git a/esphome/components/whynter/whynter.cpp b/esphome/components/whynter/whynter.cpp
index 190bf70acc..9f57fdb843 100644
--- a/esphome/components/whynter/whynter.cpp
+++ b/esphome/components/whynter/whynter.cpp
@@ -118,7 +118,7 @@ bool Whynter::on_receive(remote_base::RemoteReceiveData data) {
     }
   }
 
-  ESP_LOGD(TAG, "Decoded 0x%02X", remote_state);
+  ESP_LOGD(TAG, "Decoded 0x%02" PRIX32, remote_state);
   if ((remote_state & COMMAND_MASK) != COMMAND_CODE)
     return false;
   if ((remote_state & POWER_MASK) != POWER_MASK) {
@@ -156,7 +156,7 @@ bool Whynter::on_receive(remote_base::RemoteReceiveData data) {
 }
 
 void Whynter::transmit_(uint32_t value) {
-  ESP_LOGD(TAG, "Sending whynter code: 0x%02X", value);
+  ESP_LOGD(TAG, "Sending Whynter code: 0x%02" PRIX32, value);
 
   auto transmit = this->transmitter_->transmit();
   auto *data = transmit.get_data();
diff --git a/esphome/components/whynter/whynter.h b/esphome/components/whynter/whynter.h
index 939583ebfb..8273c21e4b 100644
--- a/esphome/components/whynter/whynter.h
+++ b/esphome/components/whynter/whynter.h
@@ -2,6 +2,8 @@
 
 #include "esphome/components/climate_ir/climate_ir.h"
 
+#include <cinttypes>
+
 namespace esphome {
 namespace whynter {
 

From 19736f6e537269fff2ec42b0348b43b277dc8fb2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 18 Oct 2023 22:12:35 +1300
Subject: [PATCH 023/131] Fix voice_assistant without a speaker (#5558)

---
 esphome/components/voice_assistant/voice_assistant.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index 27dc201073..df7853156d 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -316,8 +316,8 @@ void VoiceAssistant::loop() {
         this->speaker_buffer_index_ = 0;
         memset(this->speaker_buffer_, 0, SPEAKER_BUFFER_SIZE);
       }
-#endif
       this->wait_for_stream_end_ = false;
+#endif
       this->set_state_(State::IDLE, State::IDLE);
       break;
     }
@@ -586,7 +586,9 @@ void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_STREAM_START: {
+#ifdef USE_SPEAKER
       this->wait_for_stream_end_ = true;
+#endif
       break;
     }
     case api::enums::VOICE_ASSISTANT_TTS_STREAM_END: {

From b735fc475e65799a5d95fb7a4bf4f51b82efdfc9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Oct 2023 08:28:52 -1000
Subject: [PATCH 024/131] Bump aioesphomeapi from 15.0.0 to 18.0.6 (#5557)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 97e42663d7..44a9dc4916 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
-aioesphomeapi==15.0.0
+aioesphomeapi==18.0.6
 zeroconf==0.115.1
 
 # esp-idf requires this, but doesn't bundle it by default

From 10c89771e35776c3f90fbcac95fdcabb2e479812 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Oct 2023 10:21:19 -1000
Subject: [PATCH 025/131] Bump zeroconf from 0.115.1 to 0.119.0 (#5560)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 44a9dc4916..23d133a6ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
 aioesphomeapi==18.0.6
-zeroconf==0.115.1
+zeroconf==0.119.0
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From a8667b680ec76907f2b5da8f06b557e44ea097ca Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 19 Oct 2023 11:42:52 +1300
Subject: [PATCH 026/131] esp32_improv add timeout (#5556)

---
 esphome/components/esp32_improv/__init__.py        |  5 +++++
 .../esp32_improv/esp32_improv_component.h          |  5 +++++
 esphome/components/wifi/wifi_component.cpp         | 14 +++++++-------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/esphome/components/esp32_improv/__init__.py b/esphome/components/esp32_improv/__init__.py
index fba2e55ae8..49d95d89e5 100644
--- a/esphome/components/esp32_improv/__init__.py
+++ b/esphome/components/esp32_improv/__init__.py
@@ -36,6 +36,9 @@ CONFIG_SCHEMA = cv.Schema(
         cv.Optional(
             CONF_AUTHORIZED_DURATION, default="1min"
         ): cv.positive_time_period_milliseconds,
+        cv.Optional(
+            CONF_WIFI_TIMEOUT, default="1min"
+        ): cv.positive_time_period_milliseconds,
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -53,6 +56,8 @@ async def to_code(config):
     cg.add(var.set_identify_duration(config[CONF_IDENTIFY_DURATION]))
     cg.add(var.set_authorized_duration(config[CONF_AUTHORIZED_DURATION]))
 
+    cg.add(var.set_wifi_timeout(config[CONF_WIFI_TIMEOUT]))
+
     if CONF_AUTHORIZER in config and config[CONF_AUTHORIZER] is not None:
         activator = await cg.get_variable(config[CONF_AUTHORIZER])
         cg.add(var.set_authorizer(activator))
diff --git a/esphome/components/esp32_improv/esp32_improv_component.h b/esphome/components/esp32_improv/esp32_improv_component.h
index ba9892d6a5..00c6cf885a 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.h
+++ b/esphome/components/esp32_improv/esp32_improv_component.h
@@ -51,6 +51,9 @@ class ESP32ImprovComponent : public Component, public BLEServiceComponent {
   void set_identify_duration(uint32_t identify_duration) { this->identify_duration_ = identify_duration; }
   void set_authorized_duration(uint32_t authorized_duration) { this->authorized_duration_ = authorized_duration; }
 
+  void set_wifi_timeout(uint32_t wifi_timeout) { this->wifi_timeout_ = wifi_timeout; }
+  uint32_t get_wifi_timeout() const { return this->wifi_timeout_; }
+
  protected:
   bool should_start_{false};
   bool setup_complete_{false};
@@ -60,6 +63,8 @@ class ESP32ImprovComponent : public Component, public BLEServiceComponent {
   uint32_t authorized_start_{0};
   uint32_t authorized_duration_;
 
+  uint32_t wifi_timeout_{};
+
   std::vector<uint8_t> incoming_data_;
   wifi::WiFiAP connecting_sta_;
 
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 2cb36fe8ea..b08f20de21 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -8,16 +8,16 @@
 #include <user_interface.h>
 #endif
 
-#include <utility>
 #include <algorithm>
-#include "lwip/err.h"
+#include <utility>
 #include "lwip/dns.h"
+#include "lwip/err.h"
 
+#include "esphome/core/application.h"
+#include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
-#include "esphome/core/hal.h"
 #include "esphome/core/util.h"
-#include "esphome/core/application.h"
 
 #ifdef USE_CAPTIVE_PORTAL
 #include "esphome/components/captive_portal/captive_portal.h"
@@ -96,7 +96,7 @@ void WiFiComponent::start() {
 #endif
   }
 #ifdef USE_IMPROV
-  if (esp32_improv::global_improv_component != nullptr) {
+  if (!this->has_sta() && esp32_improv::global_improv_component != nullptr) {
     if (this->wifi_mode_(true, {}))
       esp32_improv::global_improv_component->start();
   }
@@ -163,8 +163,8 @@ void WiFiComponent::loop() {
     }
 
 #ifdef USE_IMPROV
-    if (esp32_improv::global_improv_component != nullptr) {
-      if (!this->is_connected()) {
+    if (esp32_improv::global_improv_component != nullptr && !esp32_improv::global_improv_component->is_active()) {
+      if (now - this->last_connected_ > esp32_improv::global_improv_component->get_wifi_timeout()) {
         if (this->wifi_mode_(true, {}))
           esp32_improv::global_improv_component->start();
       }

From b7402ee6ffb99b1b0433ea2e00e665f9dde82dd3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 19 Oct 2023 12:25:43 +1300
Subject: [PATCH 027/131] Create IPv4 sockets if ipv6 is not enabled (#5565)

---
 esphome/components/socket/socket.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/components/socket/socket.cpp b/esphome/components/socket/socket.cpp
index 824e04150b..d0fce9198f 100644
--- a/esphome/components/socket/socket.cpp
+++ b/esphome/components/socket/socket.cpp
@@ -10,7 +10,7 @@ namespace socket {
 Socket::~Socket() {}
 
 std::unique_ptr<Socket> socket_ip(int type, int protocol) {
-#if LWIP_IPV6
+#if ENABLE_IPV6
   return socket(AF_INET6, type, protocol);
 #else
   return socket(AF_INET, type, protocol);
@@ -18,7 +18,7 @@ std::unique_ptr<Socket> socket_ip(int type, int protocol) {
 }
 
 socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::string &ip_address, uint16_t port) {
-#if LWIP_IPV6
+#if ENABLE_IPV6
   if (addrlen < sizeof(sockaddr_in6)) {
     errno = EINVAL;
     return 0;
@@ -51,7 +51,7 @@ socklen_t set_sockaddr(struct sockaddr *addr, socklen_t addrlen, const std::stri
 }
 
 socklen_t set_sockaddr_any(struct sockaddr *addr, socklen_t addrlen, uint16_t port) {
-#if LWIP_IPV6
+#if ENABLE_IPV6
   if (addrlen < sizeof(sockaddr_in6)) {
     errno = EINVAL;
     return 0;

From 799c3cf439b4f2a72c0c37c42955d6e38eb334ff Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Wed, 18 Oct 2023 19:00:15 -0500
Subject: [PATCH 028/131] Incorrect ESP32 Strapping PIN Defined (#5563)

Co-authored-by: descipher <120155735+GelidusResearch@users.noreply.github.com>
---
 esphome/components/esp32/gpio_esp32.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/esp32/gpio_esp32.py b/esphome/components/esp32/gpio_esp32.py
index 66ba2ffa62..91f006444c 100644
--- a/esphome/components/esp32/gpio_esp32.py
+++ b/esphome/components/esp32/gpio_esp32.py
@@ -18,7 +18,7 @@ _ESP_SDIO_PINS = {
     11: "Flash Command",
 }
 
-_ESP32_STRAPPING_PINS = {0, 2, 4, 12, 15}
+_ESP32_STRAPPING_PINS = {0, 2, 5, 12, 15}
 _LOGGER = logging.getLogger(__name__)
 
 

From a794836ebe9c50feb2213b71d30d13e55a778ca2 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 19 Oct 2023 09:04:53 +0900
Subject: [PATCH 029/131] Add config to allow suppression of warnings about use
 of strapping pins (#5287)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/esp32/gpio.py          |  2 ++
 esphome/components/esp32/gpio_esp32.py    |  9 ++-------
 esphome/components/esp32/gpio_esp32_c2.py | 10 +++-------
 esphome/components/esp32/gpio_esp32_c3.py | 10 +++-------
 esphome/components/esp32/gpio_esp32_c6.py | 10 +++-------
 esphome/components/esp32/gpio_esp32_s2.py |  9 ++-------
 esphome/components/esp32/gpio_esp32_s3.py | 11 +++--------
 esphome/const.py                          |  1 +
 esphome/pins.py                           | 17 ++++++++++++++++-
 tests/test8.yaml                          |  4 +++-
 10 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/esphome/components/esp32/gpio.py b/esphome/components/esp32/gpio.py
index 6950cd58a0..a53649e3e4 100644
--- a/esphome/components/esp32/gpio.py
+++ b/esphome/components/esp32/gpio.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_PULLDOWN,
     CONF_PULLUP,
+    CONF_IGNORE_STRAPPING_WARNING,
 )
 from esphome import pins
 from esphome.core import CORE
@@ -176,6 +177,7 @@ ESP32_PIN_SCHEMA = cv.All(
             }
         ),
         cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+        cv.Optional(CONF_IGNORE_STRAPPING_WARNING, default=False): cv.boolean,
         cv.Optional(CONF_DRIVE_STRENGTH, default="20mA"): cv.All(
             cv.float_with_unit("current", "mA", optional_unit=True),
             cv.enum(DRIVE_STRENGTHS),
diff --git a/esphome/components/esp32/gpio_esp32.py b/esphome/components/esp32/gpio_esp32.py
index 91f006444c..d10b266c7a 100644
--- a/esphome/components/esp32/gpio_esp32.py
+++ b/esphome/components/esp32/gpio_esp32.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_PULLUP,
 )
 import esphome.config_validation as cv
+from esphome.pins import check_strapping_pin
 
 
 _ESP_SDIO_PINS = {
@@ -35,13 +36,6 @@ def esp32_validate_gpio_pin(value):
             "flash interface in QUAD IO flash mode.",
             value,
         )
-    if value in _ESP32_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
     if value in (24, 28, 29, 30, 31):
         # These pins are not exposed in GPIO mux (reason unknown)
         # but they're missing from IO_MUX list in datasheet
@@ -74,4 +68,5 @@ def esp32_validate_supports(value):
             f"GPIO{num} (34-39) does not support pulldowns.", [CONF_MODE, CONF_PULLDOWN]
         )
 
+    check_strapping_pin(value, _ESP32_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/components/esp32/gpio_esp32_c2.py b/esphome/components/esp32/gpio_esp32_c2.py
index c444f804a3..0bee7d82bf 100644
--- a/esphome/components/esp32/gpio_esp32_c2.py
+++ b/esphome/components/esp32/gpio_esp32_c2.py
@@ -1,6 +1,7 @@
 import logging
 
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
+from esphome.pins import check_strapping_pin
 
 import esphome.config_validation as cv
 
@@ -12,13 +13,6 @@ _LOGGER = logging.getLogger(__name__)
 def esp32_c2_validate_gpio_pin(value):
     if value < 0 or value > 20:
         raise cv.Invalid(f"Invalid pin number: {value} (must be 0-20)")
-    if value in _ESP32C2_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
 
     return value
 
@@ -34,4 +28,6 @@ def esp32_c2_validate_supports(value):
     if is_input:
         # All ESP32 pins support input mode
         pass
+
+    check_strapping_pin(value, _ESP32C2_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/components/esp32/gpio_esp32_c3.py b/esphome/components/esp32/gpio_esp32_c3.py
index fc1cef29e5..6c70c09f9e 100644
--- a/esphome/components/esp32/gpio_esp32_c3.py
+++ b/esphome/components/esp32/gpio_esp32_c3.py
@@ -6,6 +6,7 @@ from esphome.const import (
     CONF_NUMBER,
 )
 import esphome.config_validation as cv
+from esphome.pins import check_strapping_pin
 
 _ESP32C3_SPI_PSRAM_PINS = {
     12: "SPIHD",
@@ -28,13 +29,6 @@ def esp32_c3_validate_gpio_pin(value):
         raise cv.Invalid(
             f"This pin cannot be used on ESP32-C3s and is already used by the SPI/PSRAM interface (function: {_ESP32C3_SPI_PSRAM_PINS[value]})"
         )
-    if value in _ESP32C3_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
 
     return value
 
@@ -50,4 +44,6 @@ def esp32_c3_validate_supports(value):
     if is_input:
         # All ESP32 pins support input mode
         pass
+
+    check_strapping_pin(value, _ESP32C3_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/components/esp32/gpio_esp32_c6.py b/esphome/components/esp32/gpio_esp32_c6.py
index b26b6bc6b4..a1f777c625 100644
--- a/esphome/components/esp32/gpio_esp32_c6.py
+++ b/esphome/components/esp32/gpio_esp32_c6.py
@@ -3,6 +3,7 @@ import logging
 from esphome.const import CONF_INPUT, CONF_MODE, CONF_NUMBER
 
 import esphome.config_validation as cv
+from esphome.pins import check_strapping_pin
 
 _ESP32C6_SPI_PSRAM_PINS = {
     24: "SPICS0",
@@ -26,13 +27,6 @@ def esp32_c6_validate_gpio_pin(value):
         raise cv.Invalid(
             f"This pin cannot be used on ESP32-C6s and is already used by the SPI/PSRAM interface (function: {_ESP32C6_SPI_PSRAM_PINS[value]})"
         )
-    if value in _ESP32C6_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
 
     return value
 
@@ -47,4 +41,6 @@ def esp32_c6_validate_supports(value):
     if is_input:
         # All ESP32 pins support input mode
         pass
+
+    check_strapping_pin(value, _ESP32C6_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/components/esp32/gpio_esp32_s2.py b/esphome/components/esp32/gpio_esp32_s2.py
index db244b6259..82449532ec 100644
--- a/esphome/components/esp32/gpio_esp32_s2.py
+++ b/esphome/components/esp32/gpio_esp32_s2.py
@@ -10,6 +10,7 @@ from esphome.const import (
 )
 
 import esphome.config_validation as cv
+from esphome.pins import check_strapping_pin
 
 _ESP32S2_SPI_PSRAM_PINS = {
     26: "SPICS1",
@@ -34,13 +35,6 @@ def esp32_s2_validate_gpio_pin(value):
         raise cv.Invalid(
             f"This pin cannot be used on ESP32-S2s and is already used by the SPI/PSRAM interface (function: {_ESP32S2_SPI_PSRAM_PINS[value]})"
         )
-    if value in _ESP32S2_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
 
     if value in (22, 23, 24, 25):
         # These pins are not exposed in GPIO mux (reason unknown)
@@ -77,4 +71,5 @@ def esp32_s2_validate_supports(value):
             f"GPIO{num} does not support pulldowns.", [CONF_MODE, CONF_PULLDOWN]
         )
 
+    check_strapping_pin(value, _ESP32S2_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/components/esp32/gpio_esp32_s3.py b/esphome/components/esp32/gpio_esp32_s3.py
index f729a757c2..8dcbf8c7bb 100644
--- a/esphome/components/esp32/gpio_esp32_s3.py
+++ b/esphome/components/esp32/gpio_esp32_s3.py
@@ -7,6 +7,7 @@ from esphome.const import (
 )
 
 import esphome.config_validation as cv
+from esphome.pins import check_strapping_pin
 
 _ESP_32S3_SPI_PSRAM_PINS = {
     26: "SPICS1",
@@ -45,14 +46,6 @@ def esp32_s3_validate_gpio_pin(value):
             value,
         )
 
-    if value in _ESP_32S3_STRAPPING_PINS:
-        _LOGGER.warning(
-            "GPIO%d is a Strapping PIN and should be avoided.\n"
-            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
-            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
-            value,
-        )
-
     if value in (22, 23, 24, 25):
         # These pins are not exposed in GPIO mux (reason unknown)
         # but they're missing from IO_MUX list in datasheet
@@ -71,4 +64,6 @@ def esp32_s3_validate_supports(value):
     if is_input:
         # All ESP32 pins support input mode
         pass
+
+    check_strapping_pin(value, _ESP_32S3_STRAPPING_PINS, _LOGGER)
     return value
diff --git a/esphome/const.py b/esphome/const.py
index eb7a5dab09..be561c2880 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -335,6 +335,7 @@ CONF_IDLE_LEVEL = "idle_level"
 CONF_IDLE_TIME = "idle_time"
 CONF_IF = "if"
 CONF_IGNORE_EFUSE_MAC_CRC = "ignore_efuse_mac_crc"
+CONF_IGNORE_STRAPPING_WARNING = "ignore_strapping_warning"
 CONF_IIR_FILTER = "iir_filter"
 CONF_ILLUMINANCE = "illuminance"
 CONF_IMPEDANCE = "impedance"
diff --git a/esphome/pins.py b/esphome/pins.py
index 2ac4cd4b54..cec715b922 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -9,11 +9,11 @@ from esphome.const import (
     CONF_OUTPUT,
     CONF_PULLDOWN,
     CONF_PULLUP,
+    CONF_IGNORE_STRAPPING_WARNING,
 )
 from esphome.util import SimpleRegistry
 from esphome.core import CORE
 
-
 PIN_SCHEMA_REGISTRY = SimpleRegistry()
 
 
@@ -146,3 +146,18 @@ internal_gpio_input_pullup_pin_number = _internal_number_creator(
         CONF_PULLUP: True,
     }
 )
+
+
+def check_strapping_pin(conf, strapping_pin_list, logger):
+    import esphome.config_validation as cv
+
+    num = conf[CONF_NUMBER]
+    if num in strapping_pin_list and not conf.get(CONF_IGNORE_STRAPPING_WARNING):
+        logger.warning(
+            f"GPIO{num} is a strapping PIN and should only be used for I/O with care.\n"
+            "Attaching external pullup/down resistors to strapping pins can cause unexpected failures.\n"
+            "See https://esphome.io/guides/faq.html#why-am-i-getting-a-warning-about-strapping-pins",
+        )
+    # mitigate undisciplined use of strapping:
+    if num not in strapping_pin_list and conf.get(CONF_IGNORE_STRAPPING_WARNING):
+        raise cv.Invalid(f"GPIO{num} is not a strapping pin")
diff --git a/tests/test8.yaml b/tests/test8.yaml
index 3ba8aa19ef..cbac2cb833 100644
--- a/tests/test8.yaml
+++ b/tests/test8.yaml
@@ -65,7 +65,9 @@ i2c:
 
 touchscreen:
   - platform: tt21100
-    interrupt_pin: GPIO3
+    interrupt_pin:
+      number: GPIO3
+      ignore_strapping_warning: true
     reset_pin: GPIO48
 
 binary_sensor:

From a7d817656e0546b99d629065479b80b25027ee06 Mon Sep 17 00:00:00 2001
From: jj-uk <10943625+jj-uk@users.noreply.github.com>
Date: Thu, 19 Oct 2023 01:06:28 +0100
Subject: [PATCH 030/131] Hydreon updates (#5424)

---
 .../components/hydreon_rgxx/hydreon_rgxx.cpp  | 36 +++++++++++++++++--
 .../components/hydreon_rgxx/hydreon_rgxx.h    |  3 ++
 esphome/components/hydreon_rgxx/sensor.py     | 16 +++++++--
 tests/test3.yaml                              |  6 ++++
 4 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp b/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
index da4345e136..58e00ba7a5 100644
--- a/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
+++ b/esphome/components/hydreon_rgxx/hydreon_rgxx.cpp
@@ -25,6 +25,10 @@ void HydreonRGxxComponent::dump_config() {
     LOG_SENSOR("  ", #s, this->sensors_[i - 1]); \
   }
   HYDREON_RGXX_PROTOCOL_LIST(HYDREON_RGXX_LOG_SENSOR, );
+
+  if (this->model_ == RG9) {
+    ESP_LOGCONFIG(TAG, "disable_led: %s", TRUEFALSE(this->disable_led_));
+  }
 }
 
 void HydreonRGxxComponent::setup() {
@@ -187,7 +191,20 @@ void HydreonRGxxComponent::process_line_() {
     this->cancel_interval("reboot");
     this->no_response_count_ = 0;
     ESP_LOGI(TAG, "Boot detected: %s", this->buffer_.substr(0, this->buffer_.size() - 2).c_str());
-    this->write_str("P\nH\nM\n");  // set sensor to polling mode, high res mode, metric mode
+
+    if (this->model_ == RG15) {
+      this->write_str("P\nH\nM\n");  // set sensor to (P)polling mode, (H)high res mode, (M)metric mode
+    }
+
+    if (this->model_ == RG9) {
+      this->write_str("P\n");  // set sensor to (P)polling mode
+
+      if (this->disable_led_) {
+        this->write_str("D 1\n");  // set sensor (D 1)rain detection LED disabled
+      } else {
+        this->write_str("D 0\n");  // set sensor (D 0)rain detection LED enabled
+      }
+    }
     return;
   }
   if (this->buffer_starts_with_("SW")) {
@@ -227,7 +244,22 @@ void HydreonRGxxComponent::process_line_() {
       if (n == std::string::npos) {
         continue;
       }
-      float data = strtof(this->buffer_.substr(n + strlen(PROTOCOL_NAMES[i])).c_str(), nullptr);
+
+      if (n == this->buffer_.find('t', n)) {
+        // The device temperature ('t') response contains both °C and °F values:
+        // "t 72F 22C".
+        // ESPHome uses only °C, only parse °C value (move past 'F').
+        n = this->buffer_.find('F', n);
+        if (n == std::string::npos) {
+          continue;
+        }
+        n += 1;  // move past 'F'
+      } else {
+        n += strlen(PROTOCOL_NAMES[i]);  // move past protocol name
+      }
+
+      // parse value, starting at str position n
+      float data = strtof(this->buffer_.substr(n).c_str(), nullptr);
       this->sensors_[i]->publish_state(data);
       ESP_LOGD(TAG, "Received %s: %f", PROTOCOL_NAMES[i], this->sensors_[i]->get_raw_state());
       this->sensors_received_ |= (1 << i);
diff --git a/esphome/components/hydreon_rgxx/hydreon_rgxx.h b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
index 34b9bd8d5e..1edda59800 100644
--- a/esphome/components/hydreon_rgxx/hydreon_rgxx.h
+++ b/esphome/components/hydreon_rgxx/hydreon_rgxx.h
@@ -49,6 +49,8 @@ class HydreonRGxxComponent : public PollingComponent, public uart::UARTDevice {
 
   float get_setup_priority() const override;
 
+  void set_disable_led(bool disable_led) { this->disable_led_ = disable_led; }
+
  protected:
   void process_line_();
   void schedule_reboot_();
@@ -72,6 +74,7 @@ class HydreonRGxxComponent : public PollingComponent, public uart::UARTDevice {
   bool lens_bad_ = false;
   bool em_sat_ = false;
   bool request_temperature_ = false;
+  bool disable_led_ = false;
 
   // bit field showing which sensors we have received data for
   int sensors_received_ = -1;
diff --git a/esphome/components/hydreon_rgxx/sensor.py b/esphome/components/hydreon_rgxx/sensor.py
index c2dbbd6737..0fc380f959 100644
--- a/esphome/components/hydreon_rgxx/sensor.py
+++ b/esphome/components/hydreon_rgxx/sensor.py
@@ -25,12 +25,17 @@ CONF_EVENT_ACC = "event_acc"
 CONF_TOTAL_ACC = "total_acc"
 CONF_R_INT = "r_int"
 
+CONF_DISABLE_LED = "disable_led"
+
 RG_MODELS = {
     "RG_9": RGModel.RG9,
     "RG_15": RGModel.RG15,
-    # https://rainsensors.com/wp-content/uploads/sites/3/2020/07/rg-15_instructions_sw_1.000.pdf
-    # https://rainsensors.com/wp-content/uploads/sites/3/2021/03/2020.08.25-rg-9_instructions.pdf
-    # https://rainsensors.com/wp-content/uploads/sites/3/2021/03/2021.03.11-rg-9_instructions.pdf
+    # RG-15
+    # 1.000 - https://rainsensors.com/wp-content/uploads/sites/3/2020/07/rg-15_instructions_sw_1.000.pdf
+    # RG-9
+    # 1.000 - https://rainsensors.com/wp-content/uploads/sites/3/2021/03/2020.08.25-rg-9_instructions.pdf
+    # 1.100 - https://rainsensors.com/wp-content/uploads/sites/3/2021/03/2021.03.11-rg-9_instructions.pdf
+    # 1.200 - https://rainsensors.com/wp-content/uploads/sites/3/2022/03/2022.02.17-rev-1.200-rg-9_instructions.pdf
 }
 SUPPORTED_SENSORS = {
     CONF_ACC: ["RG_15"],
@@ -39,6 +44,7 @@ SUPPORTED_SENSORS = {
     CONF_R_INT: ["RG_15"],
     CONF_MOISTURE: ["RG_9"],
     CONF_TEMPERATURE: ["RG_9"],
+    CONF_DISABLE_LED: ["RG_9"],
 }
 PROTOCOL_NAMES = {
     CONF_MOISTURE: "R",
@@ -105,6 +111,7 @@ CONFIG_SCHEMA = cv.All(
                 icon=ICON_THERMOMETER,
                 state_class=STATE_CLASS_MEASUREMENT,
             ),
+            cv.Optional(CONF_DISABLE_LED): cv.boolean,
         }
     )
     .extend(cv.polling_component_schema("60s"))
@@ -132,3 +139,6 @@ async def to_code(config):
             cg.add(var.set_sensor(sens, i))
 
     cg.add(var.set_request_temperature(CONF_TEMPERATURE in config))
+
+    if CONF_DISABLE_LED in config:
+        cg.add(var.set_disable_led(config[CONF_DISABLE_LED]))
diff --git a/tests/test3.yaml b/tests/test3.yaml
index e7cf24a95a..41ded7ee39 100644
--- a/tests/test3.yaml
+++ b/tests/test3.yaml
@@ -347,6 +347,10 @@ sensor:
     moisture:
       name: hydreon_rain
       id: hydreon_rain
+    temperature:
+      name: hydreon_temperature
+    disable_led: true
+
   - platform: hydreon_rgxx
     model: RG_15
     uart_id: uart_6
@@ -358,6 +362,7 @@ sensor:
       name: hydreon_total_acc
     r_int:
       name: hydreon_r_int
+
   - platform: adc
     pin: VCC
     id: my_sensor
@@ -725,6 +730,7 @@ binary_sensor:
       name: rg9_emsat
     lens_bad:
       name: rg9_lens_bad
+
   - platform: template
     id: pzemac_reset_energy
     on_press:

From 9a087c07678f22286edced4b4f9a4d283b53e725 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:08:15 +1300
Subject: [PATCH 031/131] Bump actions/checkout from 4.1.0 to 4.1.1 (#5551)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci-docker.yml           |  2 +-
 .github/workflows/ci.yml                  | 22 +++++++++++-----------
 .github/workflows/release.yml             |  6 +++---
 .github/workflows/sync-device-classes.yml |  4 ++--
 .github/workflows/yaml-lint.yml           |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci-docker.yml b/.github/workflows/ci-docker.yml
index 897d01398e..51f47d39aa 100644
--- a/.github/workflows/ci-docker.yml
+++ b/.github/workflows/ci-docker.yml
@@ -40,7 +40,7 @@ jobs:
         arch: [amd64, armv7, aarch64]
         build_type: ["ha-addon", "docker", "lint"]
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Set up Python
         uses: actions/setup-python@v4.7.1
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 435a2fdbec..70da22e57a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       cache-key: ${{ steps.cache-key.outputs.key }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Generate cache-key
         id: cache-key
         run: echo key="${{ hashFiles('requirements.txt', 'requirements_optional.txt', 'requirements_test.txt') }}" >> $GITHUB_OUTPUT
@@ -66,7 +66,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -87,7 +87,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -108,7 +108,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -129,7 +129,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -150,7 +150,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -171,7 +171,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -191,7 +191,7 @@ jobs:
       - common
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -216,7 +216,7 @@ jobs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Find all YAML test files
         id: set-matrix
         run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
@@ -241,7 +241,7 @@ jobs:
         file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
@@ -296,7 +296,7 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Restore Python
         uses: ./.github/actions/restore-python
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f7652bf478..14dbeee7b7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
     outputs:
       tag: ${{ steps.tag.outputs.tag }}
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Get tag
         id: tag
         # yamllint disable rule:line-length
@@ -43,7 +43,7 @@ jobs:
     if: github.repository == 'esphome/esphome' && github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Set up Python
         uses: actions/setup-python@v4.7.1
         with:
@@ -88,7 +88,7 @@ jobs:
             target: "lint"
             baseimg: "docker"
     steps:
-      - uses: actions/checkout@v4.1.0
+      - uses: actions/checkout@v4.1.1
       - name: Set up Python
         uses: actions/setup-python@v4.7.1
         with:
diff --git a/.github/workflows/sync-device-classes.yml b/.github/workflows/sync-device-classes.yml
index 082c63ae41..88edb63546 100644
--- a/.github/workflows/sync-device-classes.yml
+++ b/.github/workflows/sync-device-classes.yml
@@ -13,10 +13,10 @@ jobs:
     if: github.repository == 'esphome/esphome'
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
 
       - name: Checkout Home Assistant
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
         with:
           repository: home-assistant/core
           path: lib/home-assistant
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
index 65628a22bb..a77bd2c078 100644
--- a/.github/workflows/yaml-lint.yml
+++ b/.github/workflows/yaml-lint.yml
@@ -17,6 +17,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.0
+        uses: actions/checkout@v4.1.1
       - name: Run yamllint
         uses: frenck/action-yamllint@v1.4.1

From 53572dcb8a22e78666103f9d3ec9a1031bee7895 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:08:44 +1300
Subject: [PATCH 032/131] Bump pyupgrade from 3.10.1 to 3.13.0 (#5428)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .pre-commit-config.yaml                    | 2 +-
 esphome/components/remote_base/__init__.py | 4 ++--
 requirements_test.txt                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6e7261ebc3..eba6834cb6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.13.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index cf2ae89b6a..fb9d5e56a6 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -964,7 +964,7 @@ RC_SWITCH_PROTOCOL_SCHEMA = cv.Any(
 
 
 def validate_rc_switch_code(value):
-    if not isinstance(value, (str, str)):
+    if not isinstance(value, str):
         raise cv.Invalid("All RCSwitch codes must be in quotes ('')")
     for c in value:
         if c not in ("0", "1"):
@@ -981,7 +981,7 @@ def validate_rc_switch_code(value):
 
 
 def validate_rc_switch_raw_code(value):
-    if not isinstance(value, (str, str)):
+    if not isinstance(value, str):
         raise cv.Invalid("All RCSwitch raw codes must be in quotes ('')")
     for c in value:
         if c not in ("0", "1", "x"):
diff --git a/requirements_test.txt b/requirements_test.txt
index 92cb8b1be2..5178c5c11f 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.17.6
 flake8==6.1.0  # also change in .pre-commit-config.yaml when updating
 black==23.9.1  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.10.1  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.13.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From 960d6a143134dacab67a57cf74d5a0ae037281d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 13:09:04 +1300
Subject: [PATCH 033/131] Bump tzlocal from 5.0.1 to 5.1 (#5480)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 23d133a6ed..4be7279f33 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ PyYAML==6.0.1
 paho-mqtt==1.6.1
 colorama==0.4.6
 tornado==6.3.3
-tzlocal==5.0.1    # from time
+tzlocal==5.1    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.11  # When updating platformio, also update Dockerfile

From e99b8aaf96a965c02530694a4b7c1f25d7547b6f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Oct 2023 00:50:09 +0000
Subject: [PATCH 034/131] Bump black from 23.9.1 to 23.10.0 (#5561)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 requirements_test.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index eba6834cb6..578e8982da 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.9.1
+    rev: 23.10.0
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 5178c5c11f..ee3b5e89c8 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.17.6
 flake8==6.1.0  # also change in .pre-commit-config.yaml when updating
-black==23.9.1  # also change in .pre-commit-config.yaml when updating
+black==23.10.0  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.13.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From b9d72231b0f444889c53c4a44afcf5e4fa0c5a8d Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 19 Oct 2023 15:36:01 +1300
Subject: [PATCH 035/131] Fix XOR condition (#5567)

---
 esphome/core/base_automation.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/esphome/core/base_automation.h b/esphome/core/base_automation.h
index 9b3377f694..50087f3efd 100644
--- a/esphome/core/base_automation.h
+++ b/esphome/core/base_automation.h
@@ -52,12 +52,12 @@ template<typename... Ts> class XorCondition : public Condition<Ts...> {
  public:
   explicit XorCondition(const std::vector<Condition<Ts...> *> &conditions) : conditions_(conditions) {}
   bool check(Ts... x) override {
-    bool xor_state = false;
+    size_t result = 0;
     for (auto *condition : this->conditions_) {
-      xor_state = xor_state ^ condition->check(x...);
+      result += condition->check(x...);
     }
 
-    return xor_state;
+    return result == 1;
   }
 
  protected:

From b632ae49d4804a0527cd5162870de6ad2b43b450 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Thu, 19 Oct 2023 01:53:09 -0500
Subject: [PATCH 036/131] Improv Serial support via USB CDC and JTAG (#5559)

---
 esphome/components/improv_serial/__init__.py  |  13 ++-
 .../improv_serial/improv_serial_component.cpp | 102 +++++++++++++----
 .../improv_serial/improv_serial_component.h   |  11 +-
 esphome/components/logger/logger.cpp          | 107 +++++++++++++-----
 esphome/components/logger/logger.h            |  10 ++
 5 files changed, 189 insertions(+), 54 deletions(-)

diff --git a/esphome/components/improv_serial/__init__.py b/esphome/components/improv_serial/__init__.py
index 311256804b..2b377d77b8 100644
--- a/esphome/components/improv_serial/__init__.py
+++ b/esphome/components/improv_serial/__init__.py
@@ -1,10 +1,14 @@
-from esphome.components.logger import USB_CDC, USB_SERIAL_JTAG
+from esphome.components import improv_base
+from esphome.components.esp32 import get_esp32_variant
+from esphome.components.esp32.const import (
+    VARIANT_ESP32S3,
+)
+from esphome.components.logger import USB_CDC
 from esphome.const import CONF_BAUD_RATE, CONF_HARDWARE_UART, CONF_ID, CONF_LOGGER
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.core import CORE
 import esphome.final_validate as fv
-from esphome.components import improv_base
 
 AUTO_LOAD = ["improv_base"]
 CODEOWNERS = ["@esphome/core"]
@@ -30,7 +34,10 @@ def validate_logger(config):
     if logger_conf[CONF_BAUD_RATE] == 0:
         raise cv.Invalid("improv_serial requires the logger baud_rate to be not 0")
     if CORE.using_esp_idf:
-        if logger_conf[CONF_HARDWARE_UART] in [USB_SERIAL_JTAG, USB_CDC]:
+        if (
+            logger_conf[CONF_HARDWARE_UART] == USB_CDC
+            and get_esp32_variant() == VARIANT_ESP32S3
+        ):
             raise cv.Invalid(
                 "improv_serial does not support the selected logger hardware_uart"
             )
diff --git a/esphome/components/improv_serial/improv_serial_component.cpp b/esphome/components/improv_serial/improv_serial_component.cpp
index 1dd1c9cf6f..600069b781 100644
--- a/esphome/components/improv_serial/improv_serial_component.cpp
+++ b/esphome/components/improv_serial/improv_serial_component.cpp
@@ -31,26 +31,57 @@ void ImprovSerialComponent::setup() {
 
 void ImprovSerialComponent::dump_config() { ESP_LOGCONFIG(TAG, "Improv Serial:"); }
 
-int ImprovSerialComponent::available_() {
+optional<uint8_t> ImprovSerialComponent::read_byte_() {
+  optional<uint8_t> byte;
+  uint8_t data = 0;
 #ifdef USE_ARDUINO
-  return this->hw_serial_->available();
+  if (this->hw_serial_->available()) {
+    this->hw_serial_->readBytes(&data, 1);
+    byte = data;
+  }
 #endif
 #ifdef USE_ESP_IDF
-  size_t available;
-  uart_get_buffered_data_len(this->uart_num_, &available);
-  return available;
+  switch (logger::global_logger->get_uart()) {
+    case logger::UART_SELECTION_UART0:
+    case logger::UART_SELECTION_UART1:
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
+    !defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3)
+    case logger::UART_SELECTION_UART2:
+#endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3
+      if (this->uart_num_ >= 0) {
+        size_t available;
+        uart_get_buffered_data_len(this->uart_num_, &available);
+        if (available) {
+          uart_read_bytes(this->uart_num_, &data, 1, 20 / portTICK_PERIOD_MS);
+          byte = data;
+        }
+      }
+      break;
+#if defined(CONFIG_ESP_CONSOLE_USB_CDC) && (defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+    case logger::UART_SELECTION_USB_CDC:
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+      if (esp_usb_console_available_for_read()) {
+#else
+      if (esp_usb_console_read_available()) {
 #endif
-}
-
-uint8_t ImprovSerialComponent::read_byte_() {
-  uint8_t data;
-#ifdef USE_ARDUINO
-  this->hw_serial_->readBytes(&data, 1);
+        esp_usb_console_read_buf((char *) &data, 1);
+        byte = data;
+      }
+      break;
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case logger::UART_SELECTION_USB_SERIAL_JTAG: {
+      if (usb_serial_jtag_read_bytes((char *) &data, 1, 20 / portTICK_PERIOD_MS)) {
+        byte = data;
+      }
+      break;
+    }
+#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C6 || USE_ESP32_VARIANT_ESP32S3
+    default:
+      break;
+  }
 #endif
-#ifdef USE_ESP_IDF
-  uart_read_bytes(this->uart_num_, &data, 1, 20 / portTICK_PERIOD_MS);
-#endif
-  return data;
+  return byte;
 }
 
 void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
@@ -59,24 +90,49 @@ void ImprovSerialComponent::write_data_(std::vector<uint8_t> &data) {
   this->hw_serial_->write(data.data(), data.size());
 #endif
 #ifdef USE_ESP_IDF
-  uart_write_bytes(this->uart_num_, data.data(), data.size());
+  switch (logger::global_logger->get_uart()) {
+    case logger::UART_SELECTION_UART0:
+    case logger::UART_SELECTION_UART1:
+#if !defined(USE_ESP32_VARIANT_ESP32C3) && !defined(USE_ESP32_VARIANT_ESP32C6) && \
+    !defined(USE_ESP32_VARIANT_ESP32S2) && !defined(USE_ESP32_VARIANT_ESP32S3)
+    case logger::UART_SELECTION_UART2:
+#endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3
+      uart_write_bytes(this->uart_num_, data.data(), data.size());
+      break;
+#if defined(CONFIG_ESP_CONSOLE_USB_CDC) && (defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3))
+    case logger::UART_SELECTION_USB_CDC: {
+      const char *msg = (char *) data.data();
+      esp_usb_console_write_buf(msg, data.size());
+      break;
+    }
+#endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3)
+    case logger::UART_SELECTION_USB_SERIAL_JTAG:
+      usb_serial_jtag_write_bytes((char *) data.data(), data.size(), 20 / portTICK_PERIOD_MS);
+      break;
+#endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32S3
+    default:
+      break;
+  }
 #endif
 }
 
 void ImprovSerialComponent::loop() {
-  const uint32_t now = millis();
-  if (now - this->last_read_byte_ > 50) {
+  if (this->last_read_byte_ && (millis() - this->last_read_byte_ > IMPROV_SERIAL_TIMEOUT)) {
+    this->last_read_byte_ = 0;
     this->rx_buffer_.clear();
-    this->last_read_byte_ = now;
+    ESP_LOGV(TAG, "Improv Serial timeout");
   }
 
-  while (this->available_()) {
-    uint8_t byte = this->read_byte_();
-    if (this->parse_improv_serial_byte_(byte)) {
-      this->last_read_byte_ = now;
+  auto byte = this->read_byte_();
+  while (byte.has_value()) {
+    if (this->parse_improv_serial_byte_(byte.value())) {
+      this->last_read_byte_ = millis();
     } else {
+      this->last_read_byte_ = 0;
       this->rx_buffer_.clear();
     }
+    byte = this->read_byte_();
   }
 
   if (this->state_ == improv::STATE_PROVISIONING) {
diff --git a/esphome/components/improv_serial/improv_serial_component.h b/esphome/components/improv_serial/improv_serial_component.h
index 731f9f9984..8583d0762b 100644
--- a/esphome/components/improv_serial/improv_serial_component.h
+++ b/esphome/components/improv_serial/improv_serial_component.h
@@ -14,6 +14,13 @@
 #endif
 #ifdef USE_ESP_IDF
 #include <driver/uart.h>
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
+    defined(USE_ESP32_VARIANT_ESP32H2)
+#include <driver/usb_serial_jtag.h>
+#endif
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+#include <esp_private/usb_console.h>
+#endif
 #endif
 
 namespace esphome {
@@ -26,6 +33,7 @@ enum ImprovSerialType : uint8_t {
   TYPE_RPC_RESPONSE = 0x04
 };
 
+static const uint16_t IMPROV_SERIAL_TIMEOUT = 100;
 static const uint8_t IMPROV_SERIAL_VERSION = 1;
 
 class ImprovSerialComponent : public Component, public improv_base::ImprovBase {
@@ -48,8 +56,7 @@ class ImprovSerialComponent : public Component, public improv_base::ImprovBase {
   std::vector<uint8_t> build_rpc_settings_response_(improv::Command command);
   std::vector<uint8_t> build_version_info_();
 
-  int available_();
-  uint8_t read_byte_();
+  optional<uint8_t> read_byte_();
   void write_data_(std::vector<uint8_t> &data);
 
 #ifdef USE_ARDUINO
diff --git a/esphome/components/logger/logger.cpp b/esphome/components/logger/logger.cpp
index d1f3149d84..2d2524b5f4 100644
--- a/esphome/components/logger/logger.cpp
+++ b/esphome/components/logger/logger.cpp
@@ -3,8 +3,21 @@
 
 #ifdef USE_ESP_IDF
 #include <driver/uart.h>
+
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
+    defined(USE_ESP32_VARIANT_ESP32H2)
+#include <driver/usb_serial_jtag.h>
+#include <esp_vfs_dev.h>
+#include <esp_vfs_usb_serial_jtag.h>
+#endif
+
 #include "freertos/FreeRTOS.h"
 #include "esp_idf_version.h"
+
+#include <cstdint>
+#include <cstdio>
+#include <fcntl.h>
+
 #endif  // USE_ESP_IDF
 
 #if defined(USE_ESP32_FRAMEWORK_ARDUINO) || defined(USE_ESP_IDF)
@@ -93,6 +106,58 @@ void Logger::log_vprintf_(int level, const char *tag, int line, const __FlashStr
 }
 #endif
 
+#ifdef USE_ESP_IDF
+void Logger::init_uart_() {
+  uart_config_t uart_config{};
+  uart_config.baud_rate = (int) baud_rate_;
+  uart_config.data_bits = UART_DATA_8_BITS;
+  uart_config.parity = UART_PARITY_DISABLE;
+  uart_config.stop_bits = UART_STOP_BITS_1;
+  uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
+  uart_config.source_clk = UART_SCLK_DEFAULT;
+#endif
+  uart_param_config(this->uart_num_, &uart_config);
+  const int uart_buffer_size = tx_buffer_size_;
+  // Install UART driver using an event queue here
+  uart_driver_install(this->uart_num_, uart_buffer_size, uart_buffer_size, 10, nullptr, 0);
+}
+
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+void Logger::init_usb_cdc_() {}
+#endif
+
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
+    defined(USE_ESP32_VARIANT_ESP32H2)
+void Logger::init_usb_serial_jtag_() {
+  setvbuf(stdin, NULL, _IONBF, 0);  // Disable buffering on stdin
+
+  // Minicom, screen, idf_monitor send CR when ENTER key is pressed
+  esp_vfs_dev_usb_serial_jtag_set_rx_line_endings(ESP_LINE_ENDINGS_CR);
+  // Move the caret to the beginning of the next line on '\n'
+  esp_vfs_dev_usb_serial_jtag_set_tx_line_endings(ESP_LINE_ENDINGS_CRLF);
+
+  // Enable non-blocking mode on stdin and stdout
+  fcntl(fileno(stdout), F_SETFL, 0);
+  fcntl(fileno(stdin), F_SETFL, 0);
+
+  usb_serial_jtag_driver_config_t usb_serial_jtag_config{};
+  usb_serial_jtag_config.rx_buffer_size = 512;
+  usb_serial_jtag_config.tx_buffer_size = 512;
+
+  esp_err_t ret = ESP_OK;
+  // Install USB-SERIAL-JTAG driver for interrupt-driven reads and writes
+  ret = usb_serial_jtag_driver_install(&usb_serial_jtag_config);
+  if (ret != ESP_OK) {
+    return;
+  }
+
+  // Tell vfs to use usb-serial-jtag driver
+  esp_vfs_usb_serial_jtag_use_driver();
+}
+#endif
+#endif
+
 int HOT Logger::level_for(const char *tag) {
   // Uses std::vector<> for low memory footprint, though the vector
   // could be sorted to minimize lookup times. This feature isn't used that
@@ -120,19 +185,19 @@ void HOT Logger::log_message_(int level, const char *tag, int offset) {
 #ifdef USE_ESP_IDF
     if (
 #if defined(USE_ESP32_VARIANT_ESP32S2)
-        uart_ == UART_SELECTION_USB_CDC
+        this->uart_ == UART_SELECTION_USB_CDC
 #elif defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32H2)
-        uart_ == UART_SELECTION_USB_SERIAL_JTAG
+        this->uart_ == UART_SELECTION_USB_SERIAL_JTAG
 #elif defined(USE_ESP32_VARIANT_ESP32S3)
-        uart_ == UART_SELECTION_USB_CDC || uart_ == UART_SELECTION_USB_SERIAL_JTAG
+        this->uart_ == UART_SELECTION_USB_CDC || this->uart_ == UART_SELECTION_USB_SERIAL_JTAG
 #else
         /* DISABLES CODE */ (false)  // NOLINT
 #endif
     ) {
       puts(msg);
     } else {
-      uart_write_bytes(uart_num_, msg, strlen(msg));
-      uart_write_bytes(uart_num_, "\n", 1);
+      uart_write_bytes(this->uart_num_, msg, strlen(msg));
+      uart_write_bytes(this->uart_num_, "\n", 1);
     }
 #endif
   }
@@ -209,48 +274,38 @@ void Logger::pre_setup() {
     }
 #endif  // USE_ARDUINO
 #ifdef USE_ESP_IDF
-    uart_num_ = UART_NUM_0;
-    switch (uart_) {
+    this->uart_num_ = UART_NUM_0;
+    switch (this->uart_) {
       case UART_SELECTION_UART0:
-        uart_num_ = UART_NUM_0;
+        this->uart_num_ = UART_NUM_0;
         break;
       case UART_SELECTION_UART1:
-        uart_num_ = UART_NUM_1;
+        this->uart_num_ = UART_NUM_1;
         break;
 #if !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)
       case UART_SELECTION_UART2:
-        uart_num_ = UART_NUM_2;
+        this->uart_num_ = UART_NUM_2;
         break;
 #endif  // !USE_ESP32_VARIANT_ESP32C3 && !USE_ESP32_VARIANT_ESP32S2 && !USE_ESP32_VARIANT_ESP32S3 &&
         // !USE_ESP32_VARIANT_ESP32H2
 #if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
       case UART_SELECTION_USB_CDC:
-        uart_num_ = -1;
+        this->uart_num_ = -1;
+        this->init_usb_cdc_();
         break;
 #endif  // USE_ESP32_VARIANT_ESP32S2 || USE_ESP32_VARIANT_ESP32S3
 #if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
     defined(USE_ESP32_VARIANT_ESP32H2)
       case UART_SELECTION_USB_SERIAL_JTAG:
-        uart_num_ = -1;
+        this->uart_num_ = -1;
+        this->init_usb_serial_jtag_();
         break;
 #endif  // USE_ESP32_VARIANT_ESP32C3 || USE_ESP32_VARIANT_ESP32C6 || USE_ESP32_VARIANT_ESP32S3 ||
         // USE_ESP32_VARIANT_ESP32H2
     }
-    if (uart_num_ >= 0) {
-      uart_config_t uart_config{};
-      uart_config.baud_rate = (int) baud_rate_;
-      uart_config.data_bits = UART_DATA_8_BITS;
-      uart_config.parity = UART_PARITY_DISABLE;
-      uart_config.stop_bits = UART_STOP_BITS_1;
-      uart_config.flow_ctrl = UART_HW_FLOWCTRL_DISABLE;
-#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 0, 0)
-      uart_config.source_clk = UART_SCLK_DEFAULT;
-#endif
-      uart_param_config(uart_num_, &uart_config);
-      const int uart_buffer_size = tx_buffer_size_;
-      // Install UART driver using an event queue here
-      uart_driver_install(uart_num_, uart_buffer_size, uart_buffer_size, 10, nullptr, 0);
+    if (this->uart_num_ >= 0) {
+      this->init_uart_();
     }
 #endif  // USE_ESP_IDF
   }
diff --git a/esphome/components/logger/logger.h b/esphome/components/logger/logger.h
index de272934bf..3816b1dd14 100644
--- a/esphome/components/logger/logger.h
+++ b/esphome/components/logger/logger.h
@@ -107,6 +107,16 @@ class Logger : public Component {
 #endif
 
  protected:
+#ifdef USE_ESP_IDF
+  void init_uart_();
+#if defined(USE_ESP32_VARIANT_ESP32S2) || defined(USE_ESP32_VARIANT_ESP32S3)
+  void init_usb_cdc_();
+#endif
+#if defined(USE_ESP32_VARIANT_ESP32C3) || defined(USE_ESP32_VARIANT_ESP32C6) || defined(USE_ESP32_VARIANT_ESP32S3) || \
+    defined(USE_ESP32_VARIANT_ESP32H2)
+  void init_usb_serial_jtag_();
+#endif
+#endif
   void write_header_(int level, const char *tag, int line);
   void write_footer_();
   void log_message_(int level, const char *tag, int offset = 0);

From 9f033bce3b0c2c985c4328295c5e1d111168d157 Mon Sep 17 00:00:00 2001
From: "Jordan W. Cobb" <skykingjwc@yahoo.com>
Date: Thu, 19 Oct 2023 03:02:27 -0400
Subject: [PATCH 037/131] Fan no off cycle action (#5564)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/fan/__init__.py  | 17 +++++++++++++++--
 esphome/components/fan/automation.h | 12 ++++++++++--
 esphome/const.py                    |  1 +
 tests/test1.yaml                    | 13 ++++++++++++-
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/esphome/components/fan/__init__.py b/esphome/components/fan/__init__.py
index 9a05bff3a0..23df3c2214 100644
--- a/esphome/components/fan/__init__.py
+++ b/esphome/components/fan/__init__.py
@@ -14,6 +14,7 @@ from esphome.const import (
     CONF_SPEED_LEVEL_STATE_TOPIC,
     CONF_SPEED_COMMAND_TOPIC,
     CONF_SPEED_STATE_TOPIC,
+    CONF_OFF_SPEED_CYCLE,
     CONF_ON_SPEED_SET,
     CONF_ON_TURN_OFF,
     CONF_ON_TURN_ON,
@@ -217,10 +218,22 @@ async def fan_turn_on_to_code(config, action_id, template_arg, args):
     return var
 
 
-@automation.register_action("fan.cycle_speed", CycleSpeedAction, FAN_ACTION_SCHEMA)
+@automation.register_action(
+    "fan.cycle_speed",
+    CycleSpeedAction,
+    maybe_simple_id(
+        {
+            cv.Required(CONF_ID): cv.use_id(Fan),
+            cv.Optional(CONF_OFF_SPEED_CYCLE, default=True): cv.boolean,
+        }
+    ),
+)
 async def fan_cycle_speed_to_code(config, action_id, template_arg, args):
     paren = await cg.get_variable(config[CONF_ID])
-    return cg.new_Pvariable(action_id, template_arg, paren)
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+    template_ = await cg.templatable(config[CONF_OFF_SPEED_CYCLE], args, bool)
+    cg.add(var.set_no_off_cycle(template_))
+    return var
 
 
 @automation.register_condition(
diff --git a/esphome/components/fan/automation.h b/esphome/components/fan/automation.h
index 23fb70a95b..511acf5682 100644
--- a/esphome/components/fan/automation.h
+++ b/esphome/components/fan/automation.h
@@ -54,18 +54,26 @@ template<typename... Ts> class CycleSpeedAction : public Action<Ts...> {
  public:
   explicit CycleSpeedAction(Fan *state) : state_(state) {}
 
+  TEMPLATABLE_VALUE(bool, no_off_cycle)
+
   void play(Ts... x) override {
     // check to see if fan supports speeds and is on
     if (this->state_->get_traits().supported_speed_count()) {
       if (this->state_->state) {
         int speed = this->state_->speed + 1;
         int supported_speed_count = this->state_->get_traits().supported_speed_count();
-        if (speed > supported_speed_count) {
-          // was running at max speed, so turn off
+        bool off_speed_cycle = no_off_cycle_.value(x...);
+        if (speed > supported_speed_count && off_speed_cycle) {
+          // was running at max speed, off speed cycle enabled, so turn off
           speed = 1;
           auto call = this->state_->turn_off();
           call.set_speed(speed);
           call.perform();
+        } else if (speed > supported_speed_count && !off_speed_cycle) {
+          // was running at max speed, off speed cycle disabled, so set to lowest speed
+          auto call = this->state_->turn_on();
+          call.set_speed(1);
+          call.perform();
         } else {
           auto call = this->state_->turn_on();
           call.set_speed(speed);
diff --git a/esphome/const.py b/esphome/const.py
index be561c2880..a06c75ae44 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -475,6 +475,7 @@ CONF_NUM_SCANS = "num_scans"
 CONF_NUMBER = "number"
 CONF_NUMBER_DATAPOINT = "number_datapoint"
 CONF_OFF_MODE = "off_mode"
+CONF_OFF_SPEED_CYCLE = "off_speed_cycle"
 CONF_OFFSET = "offset"
 CONF_ON = "on"
 CONF_ON_BLE_ADVERTISE = "on_ble_advertise"
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 9bf9a32e17..acd119d8a5 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1693,7 +1693,18 @@ binary_sensor:
       number: 7
       mode: INPUT
       inverted: false
-
+  - platform: gpio
+    name: Speed Fan Cycle binary sensor"
+    pin:
+      number: 18
+      mode:
+        input: true
+        pulldown: true
+    on_press:
+      - fan.cycle_speed:
+          id: fan_speed
+          off_speed_cycle: False
+      - logger.log: "Cycle speed clicked"
   - platform: remote_receiver
     name: Raw Remote Receiver Test
     raw:

From d82471942f91a85fe5e4812edfd954f47af74c2b Mon Sep 17 00:00:00 2001
From: Trent Houliston <trent@houliston.me>
Date: Fri, 20 Oct 2023 08:28:05 +1100
Subject: [PATCH 038/131] Publish the `pulse_meter` total when setting the
 total (#5475)

---
 CODEOWNERS                                            | 2 +-
 esphome/components/pulse_meter/pulse_meter_sensor.cpp | 7 +++++++
 esphome/components/pulse_meter/pulse_meter_sensor.h   | 3 ++-
 esphome/components/pulse_meter/sensor.py              | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index b66da4fc26..0c371d6ee6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -225,7 +225,7 @@ esphome/components/pn532_spi/* @OttoWinter @jesserockz
 esphome/components/power_supply/* @esphome/core
 esphome/components/preferences/* @esphome/core
 esphome/components/psram/* @esphome/core
-esphome/components/pulse_meter/* @cstaahl @stevebaxter
+esphome/components/pulse_meter/* @TrentHouliston @cstaahl @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.cpp b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
index 6c4ebe002e..14f8e508b5 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.cpp
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.cpp
@@ -7,6 +7,13 @@ namespace pulse_meter {
 
 static const char *const TAG = "pulse_meter";
 
+void PulseMeterSensor::set_total_pulses(uint32_t pulses) {
+  this->total_pulses_ = pulses;
+  if (this->total_sensor_ != nullptr) {
+    this->total_sensor_->publish_state(this->total_pulses_);
+  }
+}
+
 void PulseMeterSensor::setup() {
   this->pin_->setup();
   this->isr_pin_ = pin_->to_isr();
diff --git a/esphome/components/pulse_meter/pulse_meter_sensor.h b/esphome/components/pulse_meter/pulse_meter_sensor.h
index fc8d47538f..1cd02e3ca2 100644
--- a/esphome/components/pulse_meter/pulse_meter_sensor.h
+++ b/esphome/components/pulse_meter/pulse_meter_sensor.h
@@ -22,7 +22,8 @@ class PulseMeterSensor : public sensor::Sensor, public Component {
   void set_timeout_us(uint32_t timeout) { this->timeout_us_ = timeout; }
   void set_total_sensor(sensor::Sensor *sensor) { this->total_sensor_ = sensor; }
   void set_filter_mode(InternalFilterMode mode) { this->filter_mode_ = mode; }
-  void set_total_pulses(uint32_t pulses) { this->total_pulses_ = pulses; }
+
+  void set_total_pulses(uint32_t pulses);
 
   void setup() override;
   void loop() override;
diff --git a/esphome/components/pulse_meter/sensor.py b/esphome/components/pulse_meter/sensor.py
index 26bc6b189b..59ffa58c21 100644
--- a/esphome/components/pulse_meter/sensor.py
+++ b/esphome/components/pulse_meter/sensor.py
@@ -19,7 +19,7 @@ from esphome.const import (
 )
 from esphome.core import CORE
 
-CODEOWNERS = ["@stevebaxter", "@cstaahl"]
+CODEOWNERS = ["@stevebaxter", "@cstaahl", "@TrentHouliston"]
 
 pulse_meter_ns = cg.esphome_ns.namespace("pulse_meter")
 

From 76417103c7559cba9cfc7d965133fe0488548193 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Oct 2023 16:48:56 -1000
Subject: [PATCH 039/131] Bump aioesphomeapi from 18.0.6 to 18.0.7 (#5573)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4be7279f33..bfab8e0faf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
-aioesphomeapi==18.0.6
+aioesphomeapi==18.0.7
 zeroconf==0.119.0
 
 # esp-idf requires this, but doesn't bundle it by default

From 05a95f8ee9f390deab5fca5e4c136fb820b25c6a Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Sat, 21 Oct 2023 06:04:07 +0200
Subject: [PATCH 040/131] Remove explicit cast for IPAddress (#5574)

* Remove explicit cast for IPAddress

* Make linter happy
---
 esphome/components/mqtt/mqtt_backend_libretiny.h | 4 +---
 tests/test9.yaml                                 | 6 ++++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_backend_libretiny.h b/esphome/components/mqtt/mqtt_backend_libretiny.h
index 5373a1926a..ac4d4298fc 100644
--- a/esphome/components/mqtt/mqtt_backend_libretiny.h
+++ b/esphome/components/mqtt/mqtt_backend_libretiny.h
@@ -19,9 +19,7 @@ class MQTTBackendLibreTiny final : public MQTTBackend {
   void set_will(const char *topic, uint8_t qos, bool retain, const char *payload) final {
     mqtt_client_.setWill(topic, qos, retain, payload);
   }
-  void set_server(network::IPAddress ip, uint16_t port) final {
-    mqtt_client_.setServer(IPAddress(static_cast<uint32_t>(ip)), port);
-  }
+  void set_server(network::IPAddress ip, uint16_t port) final { mqtt_client_.setServer(IPAddress(ip), port); }
   void set_server(const char *host, uint16_t port) final { mqtt_client_.setServer(host, port); }
 #if ASYNC_TCP_SSL_ENABLED
   void set_secure(bool secure) { mqtt_client.setSecure(secure); }
diff --git a/tests/test9.yaml b/tests/test9.yaml
index ccf5f4b5b0..d660b4f24a 100644
--- a/tests/test9.yaml
+++ b/tests/test9.yaml
@@ -26,3 +26,9 @@ sensor:
     name: ADC
     pin: GPIO23
     update_interval: 1s
+
+mqtt:
+  broker: test.mosquitto.org
+  port: 1883
+  discovery: true
+  discovery_prefix: homeassistant

From 3d7d0d4f73bc17a86ad25e1cdb725d4d4c1bde55 Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Sat, 21 Oct 2023 21:38:22 +0200
Subject: [PATCH 041/131] Remove unnecessary checks in Nextion component
 (#5578)

---
 esphome/components/nextion/nextion_commands.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/esphome/components/nextion/nextion_commands.cpp b/esphome/components/nextion/nextion_commands.cpp
index 0409e5ea6c..806e03850f 100644
--- a/esphome/components/nextion/nextion_commands.cpp
+++ b/esphome/components/nextion/nextion_commands.cpp
@@ -10,15 +10,11 @@ static const char *const TAG = "nextion";
 void Nextion::soft_reset() { this->send_command_("rest"); }
 
 void Nextion::set_wake_up_page(uint8_t page_id) {
-  if (page_id > 255) {
-    ESP_LOGD(TAG, "Wake up page of bounds, range 0-255");
-    return;
-  }
   this->add_no_result_to_queue_with_set_internal_("wake_up_page", "wup", page_id, true);
 }
 
 void Nextion::set_touch_sleep_timeout(uint16_t timeout) {
-  if (timeout < 3 || timeout > 65535) {
+  if (timeout < 3) {
     ESP_LOGD(TAG, "Sleep timeout out of bounds, range 3-65535");
     return;
   }

From e3fbf54a1aafad77ab3125855f21607ed35be74d Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Mon, 23 Oct 2023 08:41:16 +0200
Subject: [PATCH 042/131] Set addr type when copy from ip4_addr_t (#5583)

---
 esphome/components/network/ip_address.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index 7a4d394805..03ba6e85d5 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -34,7 +34,12 @@ struct IPAddress {
   }
   IPAddress(const ip_addr_t *other_ip) { ip_addr_copy(ip_addr_, *other_ip); }
   IPAddress(const std::string &in_address) { ipaddr_aton(in_address.c_str(), &ip_addr_); }
-  IPAddress(ip4_addr_t *other_ip) { memcpy((void *) &ip_addr_, (void *) other_ip, sizeof(ip4_addr_t)); }
+  IPAddress(ip4_addr_t *other_ip) {
+    memcpy((void *) &ip_addr_, (void *) other_ip, sizeof(ip4_addr_t));
+#if USE_ESP32
+    ip_addr_.type = IPADDR_TYPE_V4;
+#endif
+  }
 #if USE_ARDUINO
   IPAddress(const arduino_ns::IPAddress &other_ip) { ip_addr_set_ip4_u32(&ip_addr_, other_ip); }
 #endif

From 84c00a58675a63f7ef587119494d49fb81dbe671 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Mon, 23 Oct 2023 11:26:23 -0700
Subject: [PATCH 043/131] fix canbus send config (#5585)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/canbus/__init__.py | 25 +++++++++++--------------
 tests/test1.1.yaml                    | 16 ++++++++++++++++
 tests/test1.yaml                      |  4 ++++
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/esphome/components/canbus/__init__.py b/esphome/components/canbus/__init__.py
index f49398858c..76e77021ad 100644
--- a/esphome/components/canbus/__init__.py
+++ b/esphome/components/canbus/__init__.py
@@ -17,11 +17,12 @@ CONF_ON_FRAME = "on_frame"
 
 
 def validate_id(config):
-    can_id = config[CONF_CAN_ID]
-    id_ext = config[CONF_USE_EXTENDED_ID]
-    if not id_ext:
-        if can_id > 0x7FF:
-            raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
+    if CONF_CAN_ID in config:
+        can_id = config[CONF_CAN_ID]
+        id_ext = config[CONF_USE_EXTENDED_ID]
+        if not id_ext:
+            if can_id > 0x7FF:
+                raise cv.Invalid("Standard IDs must be 11 Bit (0x000-0x7ff / 0-2047)")
     return config
 
 
@@ -151,22 +152,18 @@ async def canbus_action_to_code(config, action_id, template_arg, args):
     if can_id := config.get(CONF_CAN_ID):
         can_id = await cg.templatable(can_id, args, cg.uint32)
         cg.add(var.set_can_id(can_id))
-    use_extended_id = await cg.templatable(
-        config[CONF_USE_EXTENDED_ID], args, cg.uint32
-    )
-    cg.add(var.set_use_extended_id(use_extended_id))
+        cg.add(var.set_use_extended_id(config[CONF_USE_EXTENDED_ID]))
 
-    remote_transmission_request = await cg.templatable(
-        config[CONF_REMOTE_TRANSMISSION_REQUEST], args, bool
+    cg.add(
+        var.set_remote_transmission_request(config[CONF_REMOTE_TRANSMISSION_REQUEST])
     )
-    cg.add(var.set_remote_transmission_request(remote_transmission_request))
 
     data = config[CONF_DATA]
-    if isinstance(data, bytes):
-        data = [int(x) for x in data]
     if cg.is_template(data):
         templ = await cg.templatable(data, args, cg.std_vector.template(cg.uint8))
         cg.add(var.set_data_template(templ))
     else:
+        if isinstance(data, bytes):
+            data = [int(x) for x in data]
         cg.add(var.set_data_static(data))
     return var
diff --git a/tests/test1.1.yaml b/tests/test1.1.yaml
index 3bad4e0492..f4ad89897b 100644
--- a/tests/test1.1.yaml
+++ b/tests/test1.1.yaml
@@ -203,3 +203,19 @@ light:
         from: 20
         to: 25
       - single_light_id: ${roomname}_lights
+
+canbus:
+  - platform: esp32_can
+    id: esp32_internal_can
+    rx_pin: GPIO04
+    tx_pin: GPIO05
+    can_id: 4
+    bit_rate: 50kbps
+
+button:
+  - platform: template
+    name: Canbus Actions
+    on_press:
+      - canbus.send: "abc"
+      - canbus.send: [0, 1, 2]
+      - canbus.send: !lambda return {0, 1, 2};
diff --git a/tests/test1.yaml b/tests/test1.yaml
index acd119d8a5..f40dc35934 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -3214,6 +3214,10 @@ text_sensor:
           canbus_id: mcp2515_can
           can_id: 23
           data: [0x10, 0x20, 0x30]
+      - canbus.send:
+          canbus_id: mcp2515_can
+          can_id: 23
+          data: !lambda return {0x10, 0x20, 0x30};
       - canbus.send:
           canbus_id: esp32_internal_can
           can_id: 23

From b898f75631d9d2ec4cc2fa7a46c5ebc6a9601b69 Mon Sep 17 00:00:00 2001
From: dentra <dentra@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:29:32 +0300
Subject: [PATCH 044/131] Allow set climate preset to NONE (#5588)

---
 esphome/components/climate/climate.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/esphome/components/climate/climate.cpp b/esphome/components/climate/climate.cpp
index 1680601279..ea24cab954 100644
--- a/esphome/components/climate/climate.cpp
+++ b/esphome/components/climate/climate.cpp
@@ -213,6 +213,8 @@ ClimateCall &ClimateCall::set_preset(const std::string &preset) {
     this->set_preset(CLIMATE_PRESET_SLEEP);
   } else if (str_equals_case_insensitive(preset, "ACTIVITY")) {
     this->set_preset(CLIMATE_PRESET_ACTIVITY);
+  } else if (str_equals_case_insensitive(preset, "NONE")) {
+    this->set_preset(CLIMATE_PRESET_NONE);
   } else {
     if (this->parent_->get_traits().supports_custom_preset(preset)) {
       this->custom_preset_ = preset;

From eead33b6f2df61d77258aaac4a168b9a652081ee Mon Sep 17 00:00:00 2001
From: Guillermo Ruffino <glm.net@gmail.com>
Date: Mon, 23 Oct 2023 16:02:29 -0300
Subject: [PATCH 045/131] update storage version from mdns (#5584)

---
 esphome/zeroconf.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 924d7253df..14dd740a96 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -17,6 +17,8 @@ from zeroconf import (
     current_time_millis,
 )
 
+from esphome.storage_json import StorageJSON, ext_storage_path
+
 _CLASS_IN = 1
 _FLAGS_QR_QUERY = 0x0000  # query
 _TYPE_A = 1
@@ -131,6 +133,7 @@ TXT_RECORD_PROJECT_NAME = b"project_name"
 TXT_RECORD_PROJECT_VERSION = b"project_version"
 TXT_RECORD_NETWORK = b"network"
 TXT_RECORD_FRIENDLY_NAME = b"friendly_name"
+TXT_RECORD_VERSION = b"version"
 
 
 @dataclass
@@ -186,6 +189,10 @@ class DashboardImportDiscovery:
         ]
         if any(key not in info.properties for key in required_keys):
             # Not a dashboard import device
+            version = info.properties.get(TXT_RECORD_VERSION)
+            if version is not None:
+                version = version.decode()
+                self.update_device_mdns(node_name, version)
             return
 
         import_url = info.properties[TXT_RECORD_PACKAGE_IMPORT_URL].decode()
@@ -208,6 +215,22 @@ class DashboardImportDiscovery:
     def cancel(self) -> None:
         self.service_browser.cancel()
 
+    def update_device_mdns(self, node_name: str, version: str):
+        storage_path = ext_storage_path(node_name + ".yaml")
+        storage_json = StorageJSON.load(storage_path)
+
+        if storage_json is not None:
+            storage_version = storage_json.esphome_version
+            if version != storage_version:
+                storage_json.esphome_version = version
+                storage_json.save(storage_path)
+                _LOGGER.info(
+                    "Updated %s with mdns version %s (was %s)",
+                    node_name,
+                    version,
+                    storage_version,
+                )
+
 
 class EsphomeZeroconf(Zeroconf):
     def resolve_host(self, host: str, timeout=3.0):

From 7e27e98bff376a237b8911e87d0d44d5cd6648be Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:02:57 +0200
Subject: [PATCH 046/131] set Nextion protocol reparse mode (#5484)

---
 esphome/components/nextion/nextion.h          |  7 +++++++
 .../components/nextion/nextion_commands.cpp   | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 28663138d7..7518d7f4cb 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -623,6 +623,13 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    * @param True or false. Sleep=true to enter sleep mode or sleep=false to exit sleep mode.
    */
   void sleep(bool sleep);
+  /**
+   * Sets Nextion Protocol Reparse mode between active or passive
+   * @param True or false.
+   * active_mode=true to enter active protocol reparse mode
+   * active_mode=false to enter passive protocol reparse mode.
+   */
+  void set_protocol_reparse_mode(bool active_mode);
 
   // ========== INTERNAL METHODS ==========
   // (In most use cases you won't need these)
diff --git a/esphome/components/nextion/nextion_commands.cpp b/esphome/components/nextion/nextion_commands.cpp
index 806e03850f..c4caf29287 100644
--- a/esphome/components/nextion/nextion_commands.cpp
+++ b/esphome/components/nextion/nextion_commands.cpp
@@ -32,6 +32,25 @@ void Nextion::sleep(bool sleep) {
 }
 // End sleep safe commands
 
+// Protocol reparse mode
+void Nextion::set_protocol_reparse_mode(bool active_mode) {
+  const uint8_t to_send[3] = {0xFF, 0xFF, 0xFF};
+  if (active_mode) {  // Sets active protocol reparse mode
+    this->write_str(
+        "recmod=1");  // send_command_ cannot be used as Nextion might not be setup if incorrect reparse mode
+    this->write_array(to_send, sizeof(to_send));
+  } else {                                        // Sets passive protocol reparse mode
+    this->write_str("DRAKJHSUYDGBNCJHGJKSHBDN");  // To exit active reparse mode this sequence must be sent
+    this->write_array(to_send, sizeof(to_send));
+    this->write_str("recmod=0");  // Sending recmode=0 twice is recommended
+    this->write_array(to_send, sizeof(to_send));
+    this->write_str("recmod=0");
+    this->write_array(to_send, sizeof(to_send));
+  }
+  this->write_str("connect");
+  this->write_array(to_send, sizeof(to_send));
+}
+
 // Set Colors
 void Nextion::set_component_background_color(const char *component, uint32_t color) {
   this->add_no_result_to_queue_with_printf_("set_component_background_color", "%s.bco=%d", component, color);

From e7d51f9c16a08d1d814e4f5fe52c9ba93dc53521 Mon Sep 17 00:00:00 2001
From: Simone Rossetto <simros85@gmail.com>
Date: Mon, 23 Oct 2023 21:05:57 +0200
Subject: [PATCH 047/131] Add address text sensor to WireGuard (#5576)

---
 esphome/components/wireguard/text_sensor.py | 28 +++++++++++++++++++++
 esphome/components/wireguard/wireguard.cpp  | 10 ++++++++
 esphome/components/wireguard/wireguard.h    | 12 +++++++++
 tests/test10.yaml                           |  5 ++++
 4 files changed, 55 insertions(+)
 create mode 100644 esphome/components/wireguard/text_sensor.py

diff --git a/esphome/components/wireguard/text_sensor.py b/esphome/components/wireguard/text_sensor.py
new file mode 100644
index 0000000000..3b05f6173e
--- /dev/null
+++ b/esphome/components/wireguard/text_sensor.py
@@ -0,0 +1,28 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor
+from esphome.const import (
+    CONF_ADDRESS,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+)
+
+from . import Wireguard
+
+CONF_WIREGUARD_ID = "wireguard_id"
+
+DEPENDENCIES = ["wireguard"]
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_WIREGUARD_ID): cv.use_id(Wireguard),
+    cv.Optional(CONF_ADDRESS): text_sensor.text_sensor_schema(
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+    ),
+}
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_WIREGUARD_ID])
+
+    if address_config := config.get(CONF_ADDRESS):
+        sens = await text_sensor.new_text_sensor(address_config)
+        cg.add(parent.set_address_sensor(sens))
diff --git a/esphome/components/wireguard/wireguard.cpp b/esphome/components/wireguard/wireguard.cpp
index 1b361cc1cc..3cd4409dda 100644
--- a/esphome/components/wireguard/wireguard.cpp
+++ b/esphome/components/wireguard/wireguard.cpp
@@ -54,6 +54,12 @@ void Wireguard::setup() {
     this->wg_peer_offline_time_ = millis();
     this->srctime_->add_on_time_sync_callback(std::bind(&Wireguard::start_connection_, this));
     this->defer(std::bind(&Wireguard::start_connection_, this));  // defer to avoid blocking setup
+
+#ifdef USE_TEXT_SENSOR
+    if (this->address_sensor_ != nullptr) {
+      this->address_sensor_->publish_state(this->address_);
+    }
+#endif
   } else {
     ESP_LOGE(TAG, "cannot initialize WireGuard, error code %d", this->wg_initialized_);
     this->mark_failed();
@@ -186,6 +192,10 @@ void Wireguard::set_status_sensor(binary_sensor::BinarySensor *sensor) { this->s
 void Wireguard::set_handshake_sensor(sensor::Sensor *sensor) { this->handshake_sensor_ = sensor; }
 #endif
 
+#ifdef USE_TEXT_SENSOR
+void Wireguard::set_address_sensor(text_sensor::TextSensor *sensor) { this->address_sensor_ = sensor; }
+#endif
+
 void Wireguard::disable_auto_proceed() { this->proceed_allowed_ = false; }
 
 void Wireguard::start_connection_() {
diff --git a/esphome/components/wireguard/wireguard.h b/esphome/components/wireguard/wireguard.h
index cfc5fa1a27..c47d9e6603 100644
--- a/esphome/components/wireguard/wireguard.h
+++ b/esphome/components/wireguard/wireguard.h
@@ -17,6 +17,10 @@
 #include "esphome/components/sensor/sensor.h"
 #endif
 
+#ifdef USE_TEXT_SENSOR
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
+
 #include <esp_wireguard.h>
 
 namespace esphome {
@@ -55,6 +59,10 @@ class Wireguard : public PollingComponent {
   void set_handshake_sensor(sensor::Sensor *sensor);
 #endif
 
+#ifdef USE_TEXT_SENSOR
+  void set_address_sensor(text_sensor::TextSensor *sensor);
+#endif
+
   /// Block the setup step until peer is connected.
   void disable_auto_proceed();
 
@@ -85,6 +93,10 @@ class Wireguard : public PollingComponent {
   sensor::Sensor *handshake_sensor_ = nullptr;
 #endif
 
+#ifdef USE_TEXT_SENSOR
+  text_sensor::TextSensor *address_sensor_ = nullptr;
+#endif
+
   /// Set to false to block the setup step until peer is connected.
   bool proceed_allowed_ = true;
 
diff --git a/tests/test10.yaml b/tests/test10.yaml
index fc74d95d84..dda7601048 100644
--- a/tests/test10.yaml
+++ b/tests/test10.yaml
@@ -49,3 +49,8 @@ sensor:
   - platform: wireguard
     latest_handshake:
       name: 'WireGuard Latest Handshake'
+
+text_sensor:
+  - platform: wireguard
+    address:
+      name: 'WireGuard Address'

From 5347c9aafeb7c15f2f0a0dd664345563e5cdd902 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Mon, 23 Oct 2023 21:06:23 +0200
Subject: [PATCH 048/131] Add LibreTiny hardwares to PR Template (#5575)

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3221b8ac5c..3bf9c4e1f6 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -19,6 +19,8 @@
 - [ ] ESP32 IDF
 - [ ] ESP8266
 - [ ] RP2040
+- [ ] BK72xx
+- [ ] RTL87xx
 
 ## Example entry for `config.yaml`:
 <!--

From cf8fb7888a4b7436f518c3e8bfc7ebea859c972b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 08:43:51 +1300
Subject: [PATCH 049/131] Bump pytest-mock from 3.11.1 to 3.12.0 (#5571)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index ee3b5e89c8..c522c7b8c0 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -7,7 +7,7 @@ pre-commit
 # Unit tests
 pytest==7.4.2
 pytest-cov==4.1.0
-pytest-mock==3.11.1
+pytest-mock==3.12.0
 pytest-asyncio==0.21.1
 asyncmock==0.4.2
 hypothesis==5.49.0

From da9c2f2256aa8de2c2696d4831cba4a93a9a8fa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:35:55 +0000
Subject: [PATCH 050/131] Bump pyupgrade from 3.13.0 to 3.15.0 (#5570)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 requirements_test.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 578e8982da..e76f8b0df2 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -27,7 +27,7 @@ repos:
           - --branch=release
           - --branch=beta
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/requirements_test.txt b/requirements_test.txt
index c522c7b8c0..f8c66b5ea4 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,7 +1,7 @@
 pylint==2.17.6
 flake8==6.1.0  # also change in .pre-commit-config.yaml when updating
 black==23.10.0  # also change in .pre-commit-config.yaml when updating
-pyupgrade==3.13.0  # also change in .pre-commit-config.yaml when updating
+pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests

From b4765fb5fbf1fe659e826db57613a803d2beb595 Mon Sep 17 00:00:00 2001
From: Chris Feenstra <73584137+cfeenstra1024@users.noreply.github.com>
Date: Tue, 24 Oct 2023 00:33:47 +0200
Subject: [PATCH 051/131] Add ZH/LT-01 climate component with IR receiver
 option (#4333)

Co-authored-by: Chris Feenstra <chris@cfeenstra.nl>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                            |   1 +
 esphome/components/zhlt01/__init__.py |   0
 esphome/components/zhlt01/climate.py  |  19 ++
 esphome/components/zhlt01/zhlt01.cpp  | 238 ++++++++++++++++++++++++++
 esphome/components/zhlt01/zhlt01.h    | 167 ++++++++++++++++++
 tests/test1.yaml                      |   2 +
 6 files changed, 427 insertions(+)
 create mode 100644 esphome/components/zhlt01/__init__.py
 create mode 100644 esphome/components/zhlt01/climate.py
 create mode 100644 esphome/components/zhlt01/zhlt01.cpp
 create mode 100644 esphome/components/zhlt01/zhlt01.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 0c371d6ee6..859bcf248c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -345,4 +345,5 @@ esphome/components/xiaomi_mhoc401/* @vevsvevs
 esphome/components/xiaomi_rtcgq02lm/* @jesserockz
 esphome/components/xl9535/* @mreditor97
 esphome/components/xpt2046/* @nielsnl68 @numo68
+esphome/components/zhlt01/* @cfeenstra1024
 esphome/components/zio_ultrasonic/* @kahrendt
diff --git a/esphome/components/zhlt01/__init__.py b/esphome/components/zhlt01/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/zhlt01/climate.py b/esphome/components/zhlt01/climate.py
new file mode 100644
index 0000000000..1451f8ec69
--- /dev/null
+++ b/esphome/components/zhlt01/climate.py
@@ -0,0 +1,19 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ["climate_ir"]
+CODEOWNERS = ["@cfeenstra1024"]
+
+zhlt01_ns = cg.esphome_ns.namespace("zhlt01")
+ZHLT01Climate = zhlt01_ns.class_("ZHLT01Climate", climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
+    {cv.GenerateID(): cv.declare_id(ZHLT01Climate)}
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/zhlt01/zhlt01.cpp b/esphome/components/zhlt01/zhlt01.cpp
new file mode 100644
index 0000000000..36d1737c14
--- /dev/null
+++ b/esphome/components/zhlt01/zhlt01.cpp
@@ -0,0 +1,238 @@
+#include "zhlt01.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace zhlt01 {
+
+static const char *const TAG = "zhlt01.climate";
+
+void ZHLT01Climate::transmit_state() {
+  uint8_t ir_message[12] = {0};
+
+  // Byte 1 : Timer
+  ir_message[1] = 0x00;  // Timer off
+
+  // Byte 3 : Turbo mode
+  if (this->preset.value() == climate::CLIMATE_PRESET_BOOST) {
+    ir_message[3] = AC1_FAN_TURBO;
+  }
+
+  // Byte 5 : Last pressed button
+  ir_message[5] = 0x00;  // fixed as power button
+
+  // Byte 7 : Power | Swing | Fan
+  // -- Power
+  if (this->mode == climate::CLIMATE_MODE_OFF) {
+    ir_message[7] = AC1_POWER_OFF;
+  } else {
+    ir_message[7] = AC1_POWER_ON;
+  }
+
+  // -- Swing
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_OFF:
+      ir_message[7] |= AC1_HDIR_FIXED | AC1_VDIR_FIXED;
+      break;
+    case climate::CLIMATE_SWING_HORIZONTAL:
+      ir_message[7] |= AC1_HDIR_SWING | AC1_VDIR_FIXED;
+      break;
+    case climate::CLIMATE_SWING_VERTICAL:
+      ir_message[7] |= AC1_HDIR_FIXED | AC1_VDIR_SWING;
+      break;
+    case climate::CLIMATE_SWING_BOTH:
+      ir_message[7] |= AC1_HDIR_SWING | AC1_VDIR_SWING;
+      break;
+    default:
+      break;
+  }
+
+  // -- Fan
+  switch (this->preset.value()) {
+    case climate::CLIMATE_PRESET_BOOST:
+      ir_message[7] |= AC1_FAN3;
+      break;
+    case climate::CLIMATE_PRESET_SLEEP:
+      ir_message[7] |= AC1_FAN_SILENT;
+      break;
+    default:
+      switch (this->fan_mode.value()) {
+        case climate::CLIMATE_FAN_LOW:
+          ir_message[7] |= AC1_FAN1;
+          break;
+        case climate::CLIMATE_FAN_MEDIUM:
+          ir_message[7] |= AC1_FAN2;
+          break;
+        case climate::CLIMATE_FAN_HIGH:
+          ir_message[7] |= AC1_FAN3;
+          break;
+        case climate::CLIMATE_FAN_AUTO:
+          ir_message[7] |= AC1_FAN_AUTO;
+          break;
+        default:
+          break;
+      }
+  }
+
+  // Byte 9 : AC Mode | Temperature
+  // -- AC Mode
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_AUTO:
+    case climate::CLIMATE_MODE_HEAT_COOL:
+      ir_message[9] = AC1_MODE_AUTO;
+      break;
+    case climate::CLIMATE_MODE_COOL:
+      ir_message[9] = AC1_MODE_COOL;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      ir_message[9] = AC1_MODE_HEAT;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      ir_message[9] = AC1_MODE_DRY;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      ir_message[9] = AC1_MODE_FAN;
+      break;
+    default:
+      break;
+  }
+
+  // -- Temperature
+  ir_message[9] |= (uint8_t) (this->target_temperature - 16.0f);
+
+  // Byte 11 : Remote control ID
+  ir_message[11] = 0xD5;
+
+  // Set checksum bytes
+  for (int i = 0; i < 12; i += 2) {
+    ir_message[i] = ~ir_message[i + 1];
+  }
+
+  // Send the code
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+
+  data->set_carrier_frequency(38000);  // 38 kHz PWM
+
+  // Header
+  data->mark(AC1_HDR_MARK);
+  data->space(AC1_HDR_SPACE);
+
+  // Data
+  for (uint8_t i : ir_message) {
+    for (uint8_t j = 0; j < 8; j++) {
+      data->mark(AC1_BIT_MARK);
+      bool bit = i & (1 << j);
+      data->space(bit ? AC1_ONE_SPACE : AC1_ZERO_SPACE);
+    }
+  }
+
+  // Footer
+  data->mark(AC1_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+bool ZHLT01Climate::on_receive(remote_base::RemoteReceiveData data) {
+  // Validate header
+  if (!data.expect_item(AC1_HDR_MARK, AC1_HDR_SPACE)) {
+    ESP_LOGV(TAG, "Header fail");
+    return false;
+  }
+
+  // Decode IR message
+  uint8_t ir_message[12] = {0};
+  // Read all bytes
+  for (int i = 0; i < 12; i++) {
+    // Read bit
+    for (int j = 0; j < 8; j++) {
+      if (data.expect_item(AC1_BIT_MARK, AC1_ONE_SPACE)) {
+        ir_message[i] |= 1 << j;
+      } else if (!data.expect_item(AC1_BIT_MARK, AC1_ZERO_SPACE)) {
+        ESP_LOGV(TAG, "Byte %d bit %d fail", i, j);
+        return false;
+      }
+    }
+    ESP_LOGVV(TAG, "Byte %d %02X", i, ir_message[i]);
+  }
+
+  // Validate footer
+  if (!data.expect_mark(AC1_BIT_MARK)) {
+    ESP_LOGV(TAG, "Footer fail");
+    return false;
+  }
+
+  // Validate checksum
+  for (int i = 0; i < 12; i += 2) {
+    if (ir_message[i] != (uint8_t) (~ir_message[i + 1])) {
+      ESP_LOGV(TAG, "Byte %d checksum incorrect (%02X != %02X)", i, ir_message[i], (uint8_t) (~ir_message[i + 1]));
+      return false;
+    }
+  }
+
+  // Validate remote control ID
+  if (ir_message[11] != 0xD5) {
+    ESP_LOGV(TAG, "Invalid remote control ID");
+    return false;
+  }
+
+  // All is good to go
+
+  if ((ir_message[7] & AC1_POWER_ON) == 0) {
+    this->mode = climate::CLIMATE_MODE_OFF;
+  } else {
+    // Vertical swing
+    if ((ir_message[7] & 0x0C) == AC1_VDIR_FIXED) {
+      if ((ir_message[7] & 0x10) == AC1_HDIR_FIXED) {
+        this->swing_mode = climate::CLIMATE_SWING_OFF;
+      } else {
+        this->swing_mode = climate::CLIMATE_SWING_HORIZONTAL;
+      }
+    } else {
+      if ((ir_message[7] & 0x10) == AC1_HDIR_FIXED) {
+        this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+      } else {
+        this->swing_mode = climate::CLIMATE_SWING_BOTH;
+      }
+    }
+
+    // Preset + Fan speed
+    if ((ir_message[3] & AC1_FAN_TURBO) == AC1_FAN_TURBO) {
+      this->preset = climate::CLIMATE_PRESET_BOOST;
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+    } else if ((ir_message[7] & 0xE1) == AC1_FAN_SILENT) {
+      this->preset = climate::CLIMATE_PRESET_SLEEP;
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+    } else if ((ir_message[7] & 0xE1) == AC1_FAN_AUTO) {
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+    } else if ((ir_message[7] & 0xE1) == AC1_FAN1) {
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+    } else if ((ir_message[7] & 0xE1) == AC1_FAN2) {
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+    } else if ((ir_message[7] & 0xE1) == AC1_FAN3) {
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+    }
+
+    // AC Mode
+    if ((ir_message[9] & 0xE0) == AC1_MODE_COOL) {
+      this->mode = climate::CLIMATE_MODE_COOL;
+    } else if ((ir_message[9] & 0xE0) == AC1_MODE_HEAT) {
+      this->mode = climate::CLIMATE_MODE_HEAT;
+    } else if ((ir_message[9] & 0xE0) == AC1_MODE_DRY) {
+      this->mode = climate::CLIMATE_MODE_DRY;
+    } else if ((ir_message[9] & 0xE0) == AC1_MODE_FAN) {
+      this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+    } else {
+      this->mode = climate::CLIMATE_MODE_AUTO;
+    }
+
+    // Taregt Temperature
+    this->target_temperature = (ir_message[9] & 0x1F) + 16.0f;
+  }
+
+  this->publish_state();
+  return true;
+}
+
+}  // namespace zhlt01
+}  // namespace esphome
diff --git a/esphome/components/zhlt01/zhlt01.h b/esphome/components/zhlt01/zhlt01.h
new file mode 100644
index 0000000000..4413be2835
--- /dev/null
+++ b/esphome/components/zhlt01/zhlt01.h
@@ -0,0 +1,167 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+/***********************************************************************************
+ * SOURCE
+ ***********************************************************************************
+ * The IR codes and the functional description below were taken from
+ * 'arduino-heatpumpir/ZHLT01HeatpumpIR.h' as can be found on GitHub
+ * https://github.com/ToniA/arduino-heatpumpir/blob/master/ZHLT01HeatpumpIR.h
+ *
+ ************************************************************************************
+ *  Airconditional remote control encoder for:
+ *
+ *  ZH/LT-01 Remote control https://www.google.com/search?q=zh/lt-01
+ *
+ *  The ZH/LT-01 remote control is used for many locally branded Split
+ *  airconditioners, so it is better to name this protocol by the name of the
+ *  REMOTE rather then the name of the Airconditioner. For this project I used
+ *  a 2014 model Eurom-airconditioner, which is Dutch-branded and sold in
+ *  the Netherlands at Hornbach.
+ *
+ * For airco-brands:
+ *  Eurom
+ *  Chigo
+ *  Tristar
+ *  Tecnomaster
+ *  Elgin
+ *  Geant
+ *  Tekno
+ *  Topair
+ *  Proma
+ *  Sumikura
+ *  JBS
+ *  Turbo Air
+ *  Nakatomy
+ *  Celestial Air
+ *  Ager
+ *  Blueway
+ *  Airlux
+ *  Etc.
+ *
+ ***********************************************************************************
+ *  SUMMARY FUNCTIONAL DESCRIPTION
+ ***********************************************************************************
+ *  The remote sends a 12 Byte message which contains all possible settings every
+ *  time.
+ *
+ *  Byte 11 (and 10) contain the remote control identifier and are always 0xD5 and
+ *  0x2A respectively for the ZH/LT-01 remote control.
+ *  Every UNeven Byte (01,03,05,07 and 09) holds command data
+ *  Every EVEN Byte (00,02,04,06,08 and 10) holds a checksum of the corresponding
+ *  command-, or identifier-byte by _inverting_ the bits, for example:
+ *
+ *  The identifier byte[11] = 0xD5 = B1101 0101
+ *  The checksum byte[10]   = 0x2A = B0010 1010
+ *
+ *  So, you can check the message by:
+ *  - inverting the bits of the checksum byte with the corresponding command-, or
+ *    identifier byte, they should be the same, or
+ *  - Summing up the checksum byte and the corresponding command-, or identifier byte,
+ *    they should always add up to 0xFF = B11111111 = 255
+ *
+ *  Control bytes:
+ *  [01] - Timer (1-24 hours, Off)
+ *         Time is hardcoded to OFF
+ *
+ *  [03] - LAMP ON/OFF, TURBO ON/OFF, HOLD ON/OFF
+ *         Lamp and Hold are hardcoded to OFF
+ *         Turbo is used for the BOOST preset
+ *
+ *  [05] - Indicates which button the user _pressed_ on the remote control
+ *         Hardcoded to POWER-button
+ *
+ *  [07] - POWER ON/OFF, FAN AUTO/3/2/1, SLEEP ON/OFF, AIRFLOW ON/OFF,
+ *         VERTICAL SWING/WIND/FIXED
+ *         SLEEP is used for preset SLEEP
+ *         Vertical Swing supports Fixed, Swing and "Wind". The Wind option
+ *         is ignored in this implementation
+ *
+ *  [09] - MODE AUTO/COOL/VENT/DRY/HEAT, TEMPERATURE (16 - 32°C)
+ *
+ ***********************************************************************************/
+
+namespace esphome {
+namespace zhlt01 {
+
+/********************************************************************************
+ *  TIMINGS
+ *  Space:        Not used
+ *  Header Mark:  6100 us
+ *  Header Space: 7400 us
+ *  Bit Mark:      500 us
+ *  Zero Space:    600 us
+ *  One Space:    1800 us
+ *
+ * Note : These timings are slightly different than those of ZHLT01HeatpumpIR
+ *        The values below were measured by taking the average of 2 different
+ *        remote controls each sending 10 commands
+ *******************************************************************************/
+static const uint32_t AC1_HDR_MARK = 6100;
+static const uint32_t AC1_HDR_SPACE = 7400;
+static const uint32_t AC1_BIT_MARK = 500;
+static const uint32_t AC1_ZERO_SPACE = 600;
+static const uint32_t AC1_ONE_SPACE = 1800;
+
+/********************************************************************************
+ *
+ * ZHLT01 codes
+ *
+ *******************************************************************************/
+
+// Power
+static const uint8_t AC1_POWER_OFF = 0x00;
+static const uint8_t AC1_POWER_ON = 0x02;
+
+// Operating Modes
+static const uint8_t AC1_MODE_AUTO = 0x00;
+static const uint8_t AC1_MODE_COOL = 0x20;
+static const uint8_t AC1_MODE_DRY = 0x40;
+static const uint8_t AC1_MODE_FAN = 0x60;
+static const uint8_t AC1_MODE_HEAT = 0x80;
+
+// Fan control
+static const uint8_t AC1_FAN_AUTO = 0x00;
+static const uint8_t AC1_FAN_SILENT = 0x01;
+static const uint8_t AC1_FAN1 = 0x60;
+static const uint8_t AC1_FAN2 = 0x40;
+static const uint8_t AC1_FAN3 = 0x20;
+static const uint8_t AC1_FAN_TURBO = 0x08;
+
+// Vertical Swing
+static const uint8_t AC1_VDIR_WIND = 0x00;   // "Natural Wind", ignore
+static const uint8_t AC1_VDIR_SWING = 0x04;  // Swing
+static const uint8_t AC1_VDIR_FIXED = 0x08;  // Fixed
+
+// Horizontal Swing
+static const uint8_t AC1_HDIR_SWING = 0x00;  // Swing
+static const uint8_t AC1_HDIR_FIXED = 0x10;  // Fixed
+
+// Temperature range
+static const float AC1_TEMP_MIN = 16.0f;
+static const float AC1_TEMP_MAX = 32.0f;
+static const float AC1_TEMP_INC = 1.0f;
+
+class ZHLT01Climate : public climate_ir::ClimateIR {
+ public:
+  ZHLT01Climate()
+      : climate_ir::ClimateIR(
+            AC1_TEMP_MIN, AC1_TEMP_MAX, AC1_TEMP_INC, true, true,
+            {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+             climate::CLIMATE_FAN_HIGH},
+            {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL, climate::CLIMATE_SWING_HORIZONTAL,
+             climate::CLIMATE_SWING_BOTH},
+            {climate::CLIMATE_PRESET_NONE, climate::CLIMATE_PRESET_SLEEP, climate::CLIMATE_PRESET_BOOST}) {}
+
+  void setup() override { climate_ir::ClimateIR::setup(); }
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  /// Handle received IR Buffer
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+};
+
+}  // namespace zhlt01
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f40dc35934..bfed0d5daa 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2297,6 +2297,8 @@ climate:
     heat_mode: extended
   - platform: whynter
     name: Whynter
+  - platform: zhlt01
+    name: ZH/LT-01 Climate
 
 script:
   - id: climate_custom

From 96822aaa3a48eabf4e9ad753c46680b9eb2c8fa0 Mon Sep 17 00:00:00 2001
From: Piu Piuson <33354671+PiuPiuson@users.noreply.github.com>
Date: Tue, 24 Oct 2023 01:34:46 +0300
Subject: [PATCH 052/131] Feat: Add GREE climateir component (#4464)

Co-authored-by: orestismers <33354671+orestismers@users.noreply.github.com>
Co-authored-by: Orestes Mersinias <orestis.mers@gmail.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                          |   1 +
 esphome/components/gree/__init__.py |   0
 esphome/components/gree/climate.py  |  33 ++++++
 esphome/components/gree/gree.cpp    | 157 ++++++++++++++++++++++++++++
 esphome/components/gree/gree.h      |  97 +++++++++++++++++
 tests/test1.yaml                    |   3 +
 6 files changed, 291 insertions(+)
 create mode 100644 esphome/components/gree/__init__.py
 create mode 100644 esphome/components/gree/climate.py
 create mode 100644 esphome/components/gree/gree.cpp
 create mode 100644 esphome/components/gree/gree.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 859bcf248c..a8305a6e90 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -110,6 +110,7 @@ esphome/components/gp8403/* @jesserockz
 esphome/components/gpio/* @esphome/core
 esphome/components/gps/* @coogle
 esphome/components/graph/* @synco
+esphome/components/gree/* @orestismers
 esphome/components/grove_tb6612fng/* @max246
 esphome/components/growatt_solar/* @leeuwte
 esphome/components/haier/* @paveldn
diff --git a/esphome/components/gree/__init__.py b/esphome/components/gree/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/gree/climate.py b/esphome/components/gree/climate.py
new file mode 100644
index 0000000000..02ce7b12d4
--- /dev/null
+++ b/esphome/components/gree/climate.py
@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID, CONF_MODEL
+
+CODEOWNERS = ["@orestismers"]
+
+AUTO_LOAD = ["climate_ir"]
+
+gree_ns = cg.esphome_ns.namespace("gree")
+GreeClimate = gree_ns.class_("GreeClimate", climate_ir.ClimateIR)
+
+Model = gree_ns.enum("Model")
+MODELS = {
+    "generic": Model.GREE_GENERIC,
+    "yan": Model.GREE_YAN,
+    "yaa": Model.GREE_YAA,
+    "yac": Model.GREE_YAC,
+}
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(GreeClimate),
+        cv.Required(CONF_MODEL): cv.enum(MODELS),
+    }
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    cg.add(var.set_model(config[CONF_MODEL]))
+
+    await climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/gree/gree.cpp b/esphome/components/gree/gree.cpp
new file mode 100644
index 0000000000..1bbb443fce
--- /dev/null
+++ b/esphome/components/gree/gree.cpp
@@ -0,0 +1,157 @@
+#include "gree.h"
+#include "esphome/components/remote_base/remote_base.h"
+
+namespace esphome {
+namespace gree {
+
+static const char *const TAG = "gree.climate";
+
+void GreeClimate::set_model(Model model) { this->model_ = model; }
+
+void GreeClimate::transmit_state() {
+  uint8_t remote_state[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
+
+  remote_state[0] = this->fan_speed_() | this->operation_mode_();
+  remote_state[1] = this->temperature_();
+
+  if (this->model_ == GREE_YAN) {
+    remote_state[2] = 0x60;
+    remote_state[3] = 0x50;
+    remote_state[4] = this->vertical_swing_();
+  }
+
+  if (this->model_ == GREE_YAC) {
+    remote_state[4] |= (this->horizontal_swing_() << 4);
+  }
+
+  if (this->model_ == GREE_YAA || this->model_ == GREE_YAC) {
+    remote_state[2] = 0x20;  // bits 0..3 always 0000, bits 4..7 TURBO,LIGHT,HEALTH,X-FAN
+    remote_state[3] = 0x50;  // bits 4..7 always 0101
+    remote_state[6] = 0x20;  // YAA1FB, FAA1FB1, YB1F2 bits 4..7 always 0010
+
+    if (this->vertical_swing_() == GREE_VDIR_SWING) {
+      remote_state[0] |= (1 << 6);  // Enable swing by setting bit 6
+    } else if (this->vertical_swing_() != GREE_VDIR_AUTO) {
+      remote_state[5] = this->vertical_swing_();
+    }
+  }
+
+  // Calculate the checksum
+  if (this->model_ == GREE_YAN) {
+    remote_state[7] = ((remote_state[0] << 4) + (remote_state[1] << 4) + 0xC0);
+  } else {
+    remote_state[7] =
+        ((((remote_state[0] & 0x0F) + (remote_state[1] & 0x0F) + (remote_state[2] & 0x0F) + (remote_state[3] & 0x0F) +
+           ((remote_state[5] & 0xF0) >> 4) + ((remote_state[6] & 0xF0) >> 4) + ((remote_state[7] & 0xF0) >> 4) + 0x0A) &
+          0x0F)
+         << 4) |
+        (remote_state[7] & 0x0F);
+  }
+
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+  data->set_carrier_frequency(GREE_IR_FREQUENCY);
+
+  data->mark(GREE_HEADER_MARK);
+  data->space(GREE_HEADER_SPACE);
+
+  for (int i = 0; i < 4; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(GREE_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? GREE_ONE_SPACE : GREE_ZERO_SPACE);
+    }
+  }
+
+  data->mark(GREE_BIT_MARK);
+  data->space(GREE_ZERO_SPACE);
+  data->mark(GREE_BIT_MARK);
+  data->space(GREE_ONE_SPACE);
+  data->mark(GREE_BIT_MARK);
+  data->space(GREE_ZERO_SPACE);
+
+  data->mark(GREE_BIT_MARK);
+  data->space(GREE_MESSAGE_SPACE);
+
+  for (int i = 4; i < 8; i++) {
+    for (uint8_t mask = 1; mask > 0; mask <<= 1) {  // iterate through bit mask
+      data->mark(GREE_BIT_MARK);
+      bool bit = remote_state[i] & mask;
+      data->space(bit ? GREE_ONE_SPACE : GREE_ZERO_SPACE);
+    }
+  }
+
+  data->mark(GREE_BIT_MARK);
+  data->space(0);
+
+  transmit.perform();
+}
+
+uint8_t GreeClimate::operation_mode_() {
+  uint8_t operating_mode = GREE_MODE_ON;
+
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_COOL:
+      operating_mode |= GREE_MODE_COOL;
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      operating_mode |= GREE_MODE_DRY;
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      operating_mode |= GREE_MODE_HEAT;
+      break;
+    case climate::CLIMATE_MODE_HEAT_COOL:
+      operating_mode |= GREE_MODE_AUTO;
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      operating_mode |= GREE_MODE_FAN;
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      operating_mode = GREE_MODE_OFF;
+      break;
+  }
+
+  return operating_mode;
+}
+
+uint8_t GreeClimate::fan_speed_() {
+  switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_LOW:
+      return GREE_FAN_1;
+    case climate::CLIMATE_FAN_MEDIUM:
+      return GREE_FAN_2;
+    case climate::CLIMATE_FAN_HIGH:
+      return GREE_FAN_3;
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      return GREE_FAN_AUTO;
+  }
+}
+
+uint8_t GreeClimate::horizontal_swing_() {
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_HORIZONTAL:
+    case climate::CLIMATE_SWING_BOTH:
+      return GREE_HDIR_SWING;
+    default:
+      return GREE_HDIR_MANUAL;
+  }
+}
+
+uint8_t GreeClimate::vertical_swing_() {
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_VERTICAL:
+    case climate::CLIMATE_SWING_BOTH:
+      return GREE_VDIR_SWING;
+    default:
+      return GREE_VDIR_MANUAL;
+  }
+}
+
+uint8_t GreeClimate::temperature_() {
+  return (uint8_t) roundf(clamp<float>(this->target_temperature, GREE_TEMP_MIN, GREE_TEMP_MAX));
+}
+
+}  // namespace gree
+}  // namespace esphome
diff --git a/esphome/components/gree/gree.h b/esphome/components/gree/gree.h
new file mode 100644
index 0000000000..e7131a2b89
--- /dev/null
+++ b/esphome/components/gree/gree.h
@@ -0,0 +1,97 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace gree {
+
+// Values for GREE IR Controllers
+// Temperature
+const uint8_t GREE_TEMP_MIN = 16;  // Celsius
+const uint8_t GREE_TEMP_MAX = 30;  // Celsius
+
+// Modes
+const uint8_t GREE_MODE_AUTO = 0x00;
+const uint8_t GREE_MODE_COOL = 0x01;
+const uint8_t GREE_MODE_HEAT = 0x04;
+const uint8_t GREE_MODE_DRY = 0x02;
+const uint8_t GREE_MODE_FAN = 0x03;
+
+const uint8_t GREE_MODE_OFF = 0x00;
+const uint8_t GREE_MODE_ON = 0x08;
+
+// Fan Speed
+const uint8_t GREE_FAN_AUTO = 0x00;
+const uint8_t GREE_FAN_1 = 0x10;
+const uint8_t GREE_FAN_2 = 0x20;
+const uint8_t GREE_FAN_3 = 0x30;
+const uint8_t GREE_FAN_TURBO = 0x80;
+
+// IR Transmission
+const uint32_t GREE_IR_FREQUENCY = 38000;
+const uint32_t GREE_HEADER_MARK = 9000;
+const uint32_t GREE_HEADER_SPACE = 4000;
+const uint32_t GREE_BIT_MARK = 620;
+const uint32_t GREE_ONE_SPACE = 1600;
+const uint32_t GREE_ZERO_SPACE = 540;
+const uint32_t GREE_MESSAGE_SPACE = 19000;
+
+// Timing specific for YAC features (I-Feel mode)
+const uint32_t GREE_YAC_HEADER_MARK = 6000;
+const uint32_t GREE_YAC_HEADER_SPACE = 3000;
+const uint32_t GREE_YAC_BIT_MARK = 650;
+
+// State Frame size
+const uint8_t GREE_STATE_FRAME_SIZE = 8;
+
+// Only available on YAN
+// Vertical air directions. Note that these cannot be set on all heat pumps
+const uint8_t GREE_VDIR_AUTO = 0x00;
+const uint8_t GREE_VDIR_MANUAL = 0x00;
+const uint8_t GREE_VDIR_SWING = 0x01;
+const uint8_t GREE_VDIR_UP = 0x02;
+const uint8_t GREE_VDIR_MUP = 0x03;
+const uint8_t GREE_VDIR_MIDDLE = 0x04;
+const uint8_t GREE_VDIR_MDOWN = 0x05;
+const uint8_t GREE_VDIR_DOWN = 0x06;
+
+// Only available on YAC
+// Horizontal air directions. Note that these cannot be set on all heat pumps
+const uint8_t GREE_HDIR_AUTO = 0x00;
+const uint8_t GREE_HDIR_MANUAL = 0x00;
+const uint8_t GREE_HDIR_SWING = 0x01;
+const uint8_t GREE_HDIR_LEFT = 0x02;
+const uint8_t GREE_HDIR_MLEFT = 0x03;
+const uint8_t GREE_HDIR_MIDDLE = 0x04;
+const uint8_t GREE_HDIR_MRIGHT = 0x05;
+const uint8_t GREE_HDIR_RIGHT = 0x06;
+
+// Model codes
+enum Model { GREE_GENERIC, GREE_YAN, GREE_YAA, GREE_YAC };
+
+class GreeClimate : public climate_ir::ClimateIR {
+ public:
+  GreeClimate()
+      : climate_ir::ClimateIR(GREE_TEMP_MIN, GREE_TEMP_MAX, 1.0f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL,
+                               climate::CLIMATE_SWING_HORIZONTAL, climate::CLIMATE_SWING_BOTH}) {}
+
+  void set_model(Model model);
+
+ protected:
+  // Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+
+  uint8_t operation_mode_();
+  uint8_t fan_speed_();
+  uint8_t horizontal_swing_();
+  uint8_t vertical_swing_();
+  uint8_t temperature_();
+
+  Model model_{};
+};
+
+}  // namespace gree
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index bfed0d5daa..e1db8dda8d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2297,6 +2297,9 @@ climate:
     heat_mode: extended
   - platform: whynter
     name: Whynter
+  - platform: gree
+    name: GREE
+    model: generic
   - platform: zhlt01
     name: ZH/LT-01 Climate
 

From 34dce0acbf06f0d74a62d06f444684c9984ec64d Mon Sep 17 00:00:00 2001
From: Jevgeni Kiski <yozik04@gmail.com>
Date: Tue, 24 Oct 2023 02:35:51 +0300
Subject: [PATCH 053/131] AMS iAQ Core CO2 sensor component (#5192)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                             |  1 +
 esphome/components/iaqcore/__init__.py |  0
 esphome/components/iaqcore/iaqcore.cpp | 99 ++++++++++++++++++++++++++
 esphome/components/iaqcore/iaqcore.h   | 29 ++++++++
 esphome/components/iaqcore/sensor.py   | 57 +++++++++++++++
 tests/test1.yaml                       |  6 ++
 6 files changed, 192 insertions(+)
 create mode 100644 esphome/components/iaqcore/__init__.py
 create mode 100644 esphome/components/iaqcore/iaqcore.cpp
 create mode 100644 esphome/components/iaqcore/iaqcore.h
 create mode 100644 esphome/components/iaqcore/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index a8305a6e90..d86109581c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -132,6 +132,7 @@ 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/iaqcore/* @yozik04
 esphome/components/ili9xxx/* @clydebarrow @nielsnl68
 esphome/components/improv_base/* @esphome/core
 esphome/components/improv_serial/* @esphome/core
diff --git a/esphome/components/iaqcore/__init__.py b/esphome/components/iaqcore/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/iaqcore/iaqcore.cpp b/esphome/components/iaqcore/iaqcore.cpp
new file mode 100644
index 0000000000..810e8da0b2
--- /dev/null
+++ b/esphome/components/iaqcore/iaqcore.cpp
@@ -0,0 +1,99 @@
+#include "iaqcore.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace iaqcore {
+
+static const char *const TAG = "iaqcore";
+
+enum IAQCoreErrorCode : uint8_t { ERROR_OK = 0, ERROR_RUNIN = 0x10, ERROR_BUSY = 0x01, ERROR_ERROR = 0x80 };
+
+struct SensorData {
+  uint16_t co2;
+  IAQCoreErrorCode status;
+  int32_t resistance;
+  uint16_t tvoc;
+
+  SensorData(const uint8_t *buffer) {
+    this->co2 = encode_uint16(buffer[0], buffer[1]);
+    this->status = static_cast<IAQCoreErrorCode>(buffer[2]);
+    this->resistance = encode_uint32(buffer[3], buffer[4], buffer[5], buffer[6]);
+    this->tvoc = encode_uint16(buffer[7], buffer[8]);
+  }
+};
+
+void IAQCore::setup() {
+  if (this->write(nullptr, 0) != i2c::ERROR_OK) {
+    ESP_LOGD(TAG, "Communication failed!");
+    this->mark_failed();
+    return;
+  }
+}
+
+void IAQCore::update() {
+  uint8_t buffer[sizeof(SensorData)];
+
+  if (this->read_register(0xB5, buffer, sizeof(buffer), false) != i2c::ERROR_OK) {
+    ESP_LOGD(TAG, "Read failed");
+    this->status_set_warning();
+    this->publish_nans_();
+    return;
+  }
+
+  SensorData data(buffer);
+
+  switch (data.status) {
+    case ERROR_OK:
+      ESP_LOGD(TAG, "OK");
+      break;
+    case ERROR_RUNIN:
+      ESP_LOGI(TAG, "Warming up");
+      break;
+    case ERROR_BUSY:
+      ESP_LOGI(TAG, "Busy");
+      break;
+    case ERROR_ERROR:
+      ESP_LOGE(TAG, "Error");
+      break;
+  }
+
+  if (data.status != ERROR_OK) {
+    this->status_set_warning();
+    this->publish_nans_();
+    return;
+  }
+
+  if (this->co2_ != nullptr) {
+    this->co2_->publish_state(data.co2);
+  }
+  if (this->tvoc_ != nullptr) {
+    this->tvoc_->publish_state(data.tvoc);
+  }
+
+  this->status_clear_warning();
+}
+
+void IAQCore::publish_nans_() {
+  if (this->co2_ != nullptr) {
+    this->co2_->publish_state(NAN);
+  }
+  if (this->tvoc_ != nullptr) {
+    this->tvoc_->publish_state(NAN);
+  }
+}
+
+void IAQCore::dump_config() {
+  ESP_LOGCONFIG(TAG, "AMS iAQ Core:");
+  LOG_I2C_DEVICE(this);
+  LOG_UPDATE_INTERVAL(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with AMS iAQ Core failed!");
+  }
+  LOG_SENSOR("  ", "CO2", this->co2_);
+  LOG_SENSOR("  ", "TVOC", this->tvoc_);
+}
+
+}  // namespace iaqcore
+}  // namespace esphome
diff --git a/esphome/components/iaqcore/iaqcore.h b/esphome/components/iaqcore/iaqcore.h
new file mode 100644
index 0000000000..f343c2a705
--- /dev/null
+++ b/esphome/components/iaqcore/iaqcore.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace iaqcore {
+
+class IAQCore : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_co2(sensor::Sensor *co2) { co2_ = co2; }
+  void set_tvoc(sensor::Sensor *tvoc) { tvoc_ = tvoc; }
+
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+  sensor::Sensor *co2_{nullptr};
+  sensor::Sensor *tvoc_{nullptr};
+
+  void publish_nans_();
+};
+
+}  // namespace iaqcore
+}  // namespace esphome
diff --git a/esphome/components/iaqcore/sensor.py b/esphome/components/iaqcore/sensor.py
new file mode 100644
index 0000000000..51c5b283b7
--- /dev/null
+++ b/esphome/components/iaqcore/sensor.py
@@ -0,0 +1,57 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    CONF_CO2,
+    CONF_ID,
+    CONF_TVOC,
+    DEVICE_CLASS_CARBON_DIOXIDE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_PARTS_PER_MILLION,
+    UNIT_PARTS_PER_BILLION,
+)
+
+DEPENDENCIES = ["i2c"]
+CODEOWNERS = ["@yozik04"]
+
+
+iaqcore_ns = cg.esphome_ns.namespace("iaqcore")
+iAQCore = iaqcore_ns.class_("IAQCore", cg.PollingComponent, i2c.I2CDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(iAQCore),
+            cv.Optional(CONF_CO2): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_MILLION,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_CARBON_DIOXIDE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TVOC): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PARTS_PER_BILLION,
+                accuracy_decimals=0,
+                device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x5A))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+
+    if co2_config := config.get(CONF_CO2):
+        sens = await sensor.new_sensor(co2_config)
+        cg.add(var.set_co2(sens))
+
+    if tvoc_config := config.get(CONF_TVOC):
+        sens = await sensor.new_sensor(tvoc_config)
+        cg.add(var.set_tvoc(sens))
+
+    await i2c.register_i2c_device(var, config)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index e1db8dda8d..0a9867c0f9 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1442,6 +1442,12 @@ sensor:
       id: temp_etuve
     humidity:
       name: "Humidity hyt271"
+  - platform: iaqcore
+    i2c_id: i2c_bus
+    co2:
+      name: "iAQ Core CO2 Sensor"
+    tvoc:
+      name: "iAQ Core TVOC Sensor"
   - platform: tmp1075
     name: "Temperature TMP1075"
     update_interval: 10s

From cb2f5eb78177797d85feacc03500b8c100835553 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Mon, 23 Oct 2023 18:43:54 -0500
Subject: [PATCH 054/131] Set IP address `type` only when IPv4 and IPv6 are
 both enabled (#5595)

---
 esphome/components/network/ip_address.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index 03ba6e85d5..7bf09078be 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -36,7 +36,7 @@ struct IPAddress {
   IPAddress(const std::string &in_address) { ipaddr_aton(in_address.c_str(), &ip_addr_); }
   IPAddress(ip4_addr_t *other_ip) {
     memcpy((void *) &ip_addr_, (void *) other_ip, sizeof(ip4_addr_t));
-#if USE_ESP32
+#if USE_ESP32 && LWIP_IPV6
     ip_addr_.type = IPADDR_TYPE_V4;
 #endif
   }

From e01ba894edb6f7d7efe622901622e596cf435871 Mon Sep 17 00:00:00 2001
From: Alejandro Galfrascoli <alegalfrascoli@gmail.com>
Date: Tue, 24 Oct 2023 00:28:53 -0300
Subject: [PATCH 055/131] Add IR Noblex climate component (#4913)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                            |   1 +
 esphome/components/noblex/__init__.py |   1 +
 esphome/components/noblex/climate.py  |  20 ++
 esphome/components/noblex/noblex.cpp  | 309 ++++++++++++++++++++++++++
 esphome/components/noblex/noblex.h    |  47 ++++
 tests/test1.yaml                      |   6 +
 6 files changed, 384 insertions(+)
 create mode 100644 esphome/components/noblex/__init__.py
 create mode 100644 esphome/components/noblex/climate.py
 create mode 100644 esphome/components/noblex/noblex.cpp
 create mode 100644 esphome/components/noblex/noblex.h

diff --git a/CODEOWNERS b/CODEOWNERS
index d86109581c..6cc09bf245 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -209,6 +209,7 @@ esphome/components/nextion/sensor/* @senexcrenshaw
 esphome/components/nextion/switch/* @senexcrenshaw
 esphome/components/nextion/text_sensor/* @senexcrenshaw
 esphome/components/nfc/* @jesserockz
+esphome/components/noblex/* @AGalfra
 esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
diff --git a/esphome/components/noblex/__init__.py b/esphome/components/noblex/__init__.py
new file mode 100644
index 0000000000..ceceff9df9
--- /dev/null
+++ b/esphome/components/noblex/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@AGalfra"]
diff --git a/esphome/components/noblex/climate.py b/esphome/components/noblex/climate.py
new file mode 100644
index 0000000000..2025cb5d9e
--- /dev/null
+++ b/esphome/components/noblex/climate.py
@@ -0,0 +1,20 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import climate_ir
+from esphome.const import CONF_ID
+
+AUTO_LOAD = ["climate_ir"]
+
+noblex_ns = cg.esphome_ns.namespace("noblex")
+NoblexClimate = noblex_ns.class_("NoblexClimate", climate_ir.ClimateIR)
+
+CONFIG_SCHEMA = climate_ir.CLIMATE_IR_WITH_RECEIVER_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(NoblexClimate),
+    }
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await climate_ir.register_climate_ir(var, config)
diff --git a/esphome/components/noblex/noblex.cpp b/esphome/components/noblex/noblex.cpp
new file mode 100644
index 0000000000..3521745bdc
--- /dev/null
+++ b/esphome/components/noblex/noblex.cpp
@@ -0,0 +1,309 @@
+#include "noblex.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace noblex {
+
+static const char *const TAG = "noblex.climate";
+
+const uint16_t NOBLEX_HEADER_MARK = 9000;
+const uint16_t NOBLEX_HEADER_SPACE = 4500;
+const uint16_t NOBLEX_BIT_MARK = 660;
+const uint16_t NOBLEX_ONE_SPACE = 1640;
+const uint16_t NOBLEX_ZERO_SPACE = 520;
+const uint32_t NOBLEX_GAP = 20000;
+const uint8_t NOBLEX_POWER = 0x10;
+
+using IRNoblexMode = enum IRNoblexMode {
+  IR_NOBLEX_MODE_AUTO = 0b000,
+  IR_NOBLEX_MODE_COOL = 0b100,
+  IR_NOBLEX_MODE_DRY = 0b010,
+  IR_NOBLEX_MODE_FAN = 0b110,
+  IR_NOBLEX_MODE_HEAT = 0b001,
+};
+
+using IRNoblexFan = enum IRNoblexFan {
+  IR_NOBLEX_FAN_AUTO = 0b00,
+  IR_NOBLEX_FAN_LOW = 0b10,
+  IR_NOBLEX_FAN_MEDIUM = 0b01,
+  IR_NOBLEX_FAN_HIGH = 0b11,
+};
+
+// Transmit via IR the state of this climate controller.
+void NoblexClimate::transmit_state() {
+  uint8_t remote_state[8] = {0x80, 0x10, 0x00, 0x0A, 0x50, 0x00, 0x20, 0x00};  // OFF, COOL, 24C, FAN_AUTO
+
+  auto powered_on = this->mode != climate::CLIMATE_MODE_OFF;
+  if (powered_on) {
+    remote_state[0] |= 0x10;  // power bit
+    remote_state[2] = 0x02;
+  }
+  if (powered_on != this->powered_on_assumed)
+    this->powered_on_assumed = powered_on;
+
+  auto temp = (uint8_t) roundf(clamp<float>(this->target_temperature, NOBLEX_TEMP_MIN, NOBLEX_TEMP_MAX));
+  remote_state[1] = reverse_bits(uint8_t((temp - NOBLEX_TEMP_MIN) & 0x0F));
+
+  switch (this->mode) {
+    case climate::CLIMATE_MODE_HEAT_COOL:
+      remote_state[0] |= (IRNoblexMode::IR_NOBLEX_MODE_AUTO << 5);
+      remote_state[1] = 0x90;  // NOBLEX_TEMP_MAP 25C
+      break;
+    case climate::CLIMATE_MODE_COOL:
+      remote_state[0] |= (IRNoblexMode::IR_NOBLEX_MODE_COOL << 5);
+      break;
+    case climate::CLIMATE_MODE_DRY:
+      remote_state[0] |= (IRNoblexMode::IR_NOBLEX_MODE_DRY << 5);
+      break;
+    case climate::CLIMATE_MODE_FAN_ONLY:
+      remote_state[0] |= (IRNoblexMode::IR_NOBLEX_MODE_FAN << 5);
+      break;
+    case climate::CLIMATE_MODE_HEAT:
+      remote_state[0] |= (IRNoblexMode::IR_NOBLEX_MODE_HEAT << 5);
+      break;
+    case climate::CLIMATE_MODE_OFF:
+    default:
+      powered_on = false;
+      this->powered_on_assumed = powered_on;
+      remote_state[0] &= 0xEF;
+      remote_state[2] = 0x00;
+      break;
+  }
+
+  switch (this->fan_mode.value()) {
+    case climate::CLIMATE_FAN_LOW:
+      remote_state[0] |= (IRNoblexFan::IR_NOBLEX_FAN_LOW << 2);
+      break;
+    case climate::CLIMATE_FAN_MEDIUM:
+      remote_state[0] |= (IRNoblexFan::IR_NOBLEX_FAN_MEDIUM << 2);
+      break;
+    case climate::CLIMATE_FAN_HIGH:
+      remote_state[0] |= (IRNoblexFan::IR_NOBLEX_FAN_HIGH << 2);
+      break;
+    case climate::CLIMATE_FAN_AUTO:
+    default:
+      remote_state[0] |= (IRNoblexFan::IR_NOBLEX_FAN_AUTO << 2);
+      break;
+  }
+
+  switch (this->swing_mode) {
+    case climate::CLIMATE_SWING_VERTICAL:
+      remote_state[0] |= 0x02;
+      remote_state[4] = 0x58;
+      break;
+    case climate::CLIMATE_SWING_OFF:
+    default:
+      remote_state[0] &= 0xFD;
+      remote_state[4] = 0x50;
+      break;
+  }
+
+  uint8_t crc = 0;
+  for (uint8_t i : remote_state) {
+    crc += reverse_bits(i);
+  }
+  crc = reverse_bits(uint8_t(crc & 0x0F)) >> 4;
+
+  ESP_LOGD(TAG, "Sending noblex code: %02X%02X %02X%02X %02X%02X %02X%02X", remote_state[0], remote_state[1],
+           remote_state[2], remote_state[3], remote_state[4], remote_state[5], remote_state[6], remote_state[7]);
+
+  ESP_LOGV(TAG, "CRC: %01X", crc);
+
+  auto transmit = this->transmitter_->transmit();
+  auto *data = transmit.get_data();
+  data->set_carrier_frequency(38000);
+
+  // Header
+  data->mark(NOBLEX_HEADER_MARK);
+  data->space(NOBLEX_HEADER_SPACE);
+  // Data (sent remote_state from the MSB to the LSB)
+  for (uint8_t i : remote_state) {
+    for (int8_t j = 7; j >= 0; j--) {
+      if ((i == 4) & (j == 4)) {
+        // Header intermediate
+        data->mark(NOBLEX_BIT_MARK);
+        data->space(NOBLEX_GAP);  // gap en bit 36
+      } else {
+        data->mark(NOBLEX_BIT_MARK);
+        bool bit = i & (1 << j);
+        data->space(bit ? NOBLEX_ONE_SPACE : NOBLEX_ZERO_SPACE);
+      }
+    }
+  }
+  // send crc
+  for (int8_t i = 3; i >= 0; i--) {
+    data->mark(NOBLEX_BIT_MARK);
+    bool bit = crc & (1 << i);
+    data->space(bit ? NOBLEX_ONE_SPACE : NOBLEX_ZERO_SPACE);
+  }
+  // Footer
+  data->mark(NOBLEX_BIT_MARK);
+
+  transmit.perform();
+}  // end transmit_state()
+
+// Handle received IR Buffer
+bool NoblexClimate::on_receive(remote_base::RemoteReceiveData data) {
+  uint8_t remote_state[8] = {0};
+  uint8_t crc = 0, crc_calculated = 0;
+
+  if (!receiving_) {
+    // Validate header
+    if (data.expect_item(NOBLEX_HEADER_MARK, NOBLEX_HEADER_SPACE)) {
+      ESP_LOGV(TAG, "Header");
+      receiving_ = true;
+      // Read first 36 bits
+      for (int i = 0; i < 5; i++) {
+        // Read bit
+        for (int j = 7; j >= 0; j--) {
+          if ((i == 4) & (j == 4)) {
+            remote_state[i] |= 1 << j;
+            // Header intermediate
+            ESP_LOGVV(TAG, "GAP");
+            return false;
+          } else if (data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ONE_SPACE)) {
+            remote_state[i] |= 1 << j;
+          } else if (!data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ZERO_SPACE)) {
+            ESP_LOGVV(TAG, "Byte %d bit %d fail", i, j);
+            return false;
+          }
+        }
+        ESP_LOGV(TAG, "Byte %d %02X", i, remote_state[i]);
+      }
+
+    } else {
+      ESP_LOGV(TAG, "Header fail");
+      receiving_ = false;
+      return false;
+    }
+
+  } else {
+    // Read the remaining 28 bits
+    for (int i = 4; i < 8; i++) {
+      // Read bit
+      for (int j = 7; j >= 0; j--) {
+        if ((i == 4) & (j >= 4)) {
+          // nothing
+        } else if (data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ONE_SPACE)) {
+          remote_state[i] |= 1 << j;
+        } else if (!data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ZERO_SPACE)) {
+          ESP_LOGVV(TAG, "Byte %d bit %d fail", i, j);
+          return false;
+        }
+      }
+      ESP_LOGV(TAG, "Byte %d %02X", i, remote_state[i]);
+    }
+
+    // Read crc
+    for (int i = 3; i >= 0; i--) {
+      if (data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ONE_SPACE)) {
+        crc |= 1 << i;
+      } else if (!data.expect_item(NOBLEX_BIT_MARK, NOBLEX_ZERO_SPACE)) {
+        ESP_LOGVV(TAG, "Bit %d CRC fail", i);
+        return false;
+      }
+    }
+    ESP_LOGV(TAG, "CRC %02X", crc);
+
+    // Validate footer
+    if (!data.expect_mark(NOBLEX_BIT_MARK)) {
+      ESP_LOGV(TAG, "Footer fail");
+      return false;
+    }
+    receiving_ = false;
+  }
+
+  for (uint8_t i : remote_state)
+    crc_calculated += reverse_bits(i);
+  crc_calculated = reverse_bits(uint8_t(crc_calculated & 0x0F)) >> 4;
+  ESP_LOGVV(TAG, "CRC calc %02X", crc_calculated);
+
+  if (crc != crc_calculated) {
+    ESP_LOGV(TAG, "CRC fail");
+    return false;
+  }
+
+  ESP_LOGD(TAG, "Received noblex code: %02X%02X %02X%02X %02X%02X %02X%02X", remote_state[0], remote_state[1],
+           remote_state[2], remote_state[3], remote_state[4], remote_state[5], remote_state[6], remote_state[7]);
+
+  auto powered_on = false;
+  if ((remote_state[0] & NOBLEX_POWER) == NOBLEX_POWER) {
+    powered_on = true;
+    this->powered_on_assumed = powered_on;
+  } else {
+    powered_on = false;
+    this->powered_on_assumed = powered_on;
+    this->mode = climate::CLIMATE_MODE_OFF;
+  }
+  // powr on/off button
+  ESP_LOGV(TAG, "Power: %01X", powered_on);
+
+  // Set received mode
+  if (powered_on_assumed) {
+    auto mode = (remote_state[0] & 0xE0) >> 5;
+    ESP_LOGV(TAG, "Mode: %02X", mode);
+    switch (mode) {
+      case IRNoblexMode::IR_NOBLEX_MODE_AUTO:
+        this->mode = climate::CLIMATE_MODE_HEAT_COOL;
+        break;
+      case IRNoblexMode::IR_NOBLEX_MODE_COOL:
+        this->mode = climate::CLIMATE_MODE_COOL;
+        break;
+      case IRNoblexMode::IR_NOBLEX_MODE_DRY:
+        this->mode = climate::CLIMATE_MODE_DRY;
+        break;
+      case IRNoblexMode::IR_NOBLEX_MODE_FAN:
+        this->mode = climate::CLIMATE_MODE_FAN_ONLY;
+        break;
+      case IRNoblexMode::IR_NOBLEX_MODE_HEAT:
+        this->mode = climate::CLIMATE_MODE_HEAT;
+        break;
+    }
+  }
+
+  // Set received temp
+  uint8_t temp = remote_state[1];
+  ESP_LOGVV(TAG, "Temperature Raw: %02X", temp);
+
+  temp = 0x0F & reverse_bits(temp);
+  temp += NOBLEX_TEMP_MIN;
+  ESP_LOGV(TAG, "Temperature Climate: %u", temp);
+  this->target_temperature = temp;
+
+  // Set received fan speed
+  auto fan = (remote_state[0] & 0x0C) >> 2;
+  ESP_LOGV(TAG, "Fan: %02X", fan);
+  switch (fan) {
+    case IRNoblexFan::IR_NOBLEX_FAN_HIGH:
+      this->fan_mode = climate::CLIMATE_FAN_HIGH;
+      break;
+    case IRNoblexFan::IR_NOBLEX_FAN_MEDIUM:
+      this->fan_mode = climate::CLIMATE_FAN_MEDIUM;
+      break;
+    case IRNoblexFan::IR_NOBLEX_FAN_LOW:
+      this->fan_mode = climate::CLIMATE_FAN_LOW;
+      break;
+    case IRNoblexFan::IR_NOBLEX_FAN_AUTO:
+    default:
+      this->fan_mode = climate::CLIMATE_FAN_AUTO;
+      break;
+  }
+
+  // Set received swing status
+  if (remote_state[0] & 0x02) {
+    ESP_LOGV(TAG, "Swing vertical");
+    this->swing_mode = climate::CLIMATE_SWING_VERTICAL;
+  } else {
+    ESP_LOGV(TAG, "Swing OFF");
+    this->swing_mode = climate::CLIMATE_SWING_OFF;
+  }
+
+  for (uint8_t &i : remote_state)
+    i = 0;
+  this->publish_state();
+  return true;
+}  // end on_receive()
+
+}  // namespace noblex
+}  // namespace esphome
diff --git a/esphome/components/noblex/noblex.h b/esphome/components/noblex/noblex.h
new file mode 100644
index 0000000000..a8e5f41547
--- /dev/null
+++ b/esphome/components/noblex/noblex.h
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "esphome/components/climate_ir/climate_ir.h"
+
+namespace esphome {
+namespace noblex {
+
+// Temperature
+const uint8_t NOBLEX_TEMP_MIN = 16;  // Celsius
+const uint8_t NOBLEX_TEMP_MAX = 30;  // Celsius
+
+class NoblexClimate : public climate_ir::ClimateIR {
+ public:
+  NoblexClimate()
+      : climate_ir::ClimateIR(NOBLEX_TEMP_MIN, NOBLEX_TEMP_MAX, 1.0f, true, true,
+                              {climate::CLIMATE_FAN_AUTO, climate::CLIMATE_FAN_LOW, climate::CLIMATE_FAN_MEDIUM,
+                               climate::CLIMATE_FAN_HIGH},
+                              {climate::CLIMATE_SWING_OFF, climate::CLIMATE_SWING_VERTICAL}) {}
+
+  void setup() override {
+    climate_ir::ClimateIR::setup();
+    this->powered_on_assumed = this->mode != climate::CLIMATE_MODE_OFF;
+  }
+
+  // Override control to change settings of the climate device.
+  void control(const climate::ClimateCall &call) override {
+    send_swing_cmd_ = call.get_swing_mode().has_value();
+    // swing resets after unit powered off
+    if (call.get_mode().has_value() && *call.get_mode() == climate::CLIMATE_MODE_OFF)
+      this->swing_mode = climate::CLIMATE_SWING_OFF;
+    climate_ir::ClimateIR::control(call);
+  }
+
+  // used to track when to send the power toggle command.
+  bool powered_on_assumed;
+
+ protected:
+  /// Transmit via IR the state of this climate controller.
+  void transmit_state() override;
+  /// Handle received IR Buffer.
+  bool on_receive(remote_base::RemoteReceiveData data) override;
+  bool send_swing_cmd_{false};
+  bool receiving_ = false;
+};
+
+}  // namespace noblex
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0a9867c0f9..a8421152ed 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2303,6 +2303,11 @@ climate:
     heat_mode: extended
   - platform: whynter
     name: Whynter
+  - platform: noblex
+    name: AC Living
+    id: noblex_ac
+    sensor: ${sensorname}_sensor
+    receiver_id: rcvr
   - platform: gree
     name: GREE
     model: generic
@@ -2939,6 +2944,7 @@ tm1651:
   dio_pin: GPIO23
 
 remote_receiver:
+  id: rcvr
   pin: GPIO32
   dump: all
   on_coolix:

From cf7df9e36066ff382f1a0842c4e25ffd4ddc3780 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:08:00 -0500
Subject: [PATCH 056/131] Bump aioesphomeapi from 18.0.7 to 18.0.12 (#5597)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index bfab8e0faf..630802ee74 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
-aioesphomeapi==18.0.7
+aioesphomeapi==18.0.12
 zeroconf==0.119.0
 
 # esp-idf requires this, but doesn't bundle it by default

From e80bd8ed3d5dcbc1b7e07117e04d46b663c89162 Mon Sep 17 00:00:00 2001
From: Daniel Dunn <riverheart201@gmail.com>
Date: Wed, 25 Oct 2023 03:00:32 -0600
Subject: [PATCH 057/131] Add text component (#5336)

Co-authored-by: Maurits <maurits@vloop.nl>
Co-authored-by: mauritskorse <mauritskorse@gmail.com>
Co-authored-by: Daniel Dunn <dannydunn@eternityforest.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/api/api.proto              |  46 ++++
 esphome/components/api/api_connection.cpp     |  39 +++
 esphome/components/api/api_connection.h       |   5 +
 esphome/components/api/api_pb2.cpp            | 233 ++++++++++++++++++
 esphome/components/api/api_pb2.h              |  55 +++++
 esphome/components/api/api_pb2_service.cpp    |  42 ++++
 esphome/components/api/api_pb2_service.h      |  15 ++
 esphome/components/api/api_server.cpp         |   9 +
 esphome/components/api/api_server.h           |   3 +
 esphome/components/api/list_entities.cpp      |   4 +
 esphome/components/api/list_entities.h        |   3 +
 esphome/components/api/subscribe_state.cpp    |   3 +
 esphome/components/api/subscribe_state.h      |   3 +
 esphome/components/copy/text/__init__.py      |  36 +++
 esphome/components/copy/text/copy_text.cpp    |  25 ++
 esphome/components/copy/text/copy_text.h      |  23 ++
 esphome/components/mqtt/__init__.py           |   1 +
 esphome/components/mqtt/mqtt_text.cpp         |  63 +++++
 esphome/components/mqtt/mqtt_text.h           |  46 ++++
 esphome/components/sprinkler/__init__.py      |   2 +-
 .../components/template/number/__init__.py    |   3 +-
 .../components/template/select/__init__.py    |   3 +-
 esphome/components/template/text/__init__.py  |  92 +++++++
 .../template/text/template_text.cpp           |  64 +++++
 .../components/template/text/template_text.h  |  87 +++++++
 esphome/components/text/__init__.py           | 138 +++++++++++
 esphome/components/text/automation.h          |  33 +++
 esphome/components/text/text.cpp              |  26 ++
 esphome/components/text/text.h                |  55 +++++
 esphome/components/text/text_call.cpp         |  56 +++++
 esphome/components/text/text_call.h           |  25 ++
 esphome/components/text/text_traits.h         |  39 +++
 .../components/web_server/list_entities.cpp   |   7 +
 esphome/components/web_server/list_entities.h |   3 +
 esphome/components/web_server/web_server.cpp  |  89 +++++++
 esphome/components/web_server/web_server.h    |   9 +
 esphome/config_validation.py                  |   1 +
 esphome/const.py                              |   2 +
 esphome/core/application.h                    |  19 ++
 esphome/core/component_iterator.cpp           |  15 ++
 esphome/core/component_iterator.h             |   6 +
 esphome/core/controller.cpp                   |   6 +
 esphome/core/controller.h                     |   6 +
 esphome/core/defines.h                        |   1 +
 script/api_protobuf/api_protobuf.py           |   2 +-
 script/ci-custom.py                           |   1 +
 tests/component_tests/text/test_text.py       |  56 +++++
 tests/component_tests/text/test_text.yaml     |  33 +++
 tests/test2.yaml                              |  18 +-
 50 files changed, 1545 insertions(+), 7 deletions(-)
 create mode 100644 esphome/components/copy/text/__init__.py
 create mode 100644 esphome/components/copy/text/copy_text.cpp
 create mode 100644 esphome/components/copy/text/copy_text.h
 create mode 100644 esphome/components/mqtt/mqtt_text.cpp
 create mode 100644 esphome/components/mqtt/mqtt_text.h
 create mode 100644 esphome/components/template/text/__init__.py
 create mode 100644 esphome/components/template/text/template_text.cpp
 create mode 100644 esphome/components/template/text/template_text.h
 create mode 100644 esphome/components/text/__init__.py
 create mode 100644 esphome/components/text/automation.h
 create mode 100644 esphome/components/text/text.cpp
 create mode 100644 esphome/components/text/text.h
 create mode 100644 esphome/components/text/text_call.cpp
 create mode 100644 esphome/components/text/text_call.h
 create mode 100644 esphome/components/text/text_traits.h
 create mode 100644 tests/component_tests/text/test_text.py
 create mode 100644 tests/component_tests/text/test_text.yaml

diff --git a/CODEOWNERS b/CODEOWNERS
index 6cc09bf245..eff8f28a53 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -303,6 +303,7 @@ esphome/components/tcl112/* @glmnet
 esphome/components/tee501/* @Stock-M
 esphome/components/teleinfo/* @0hax
 esphome/components/template/alarm_control_panel/* @grahambrown11
+esphome/components/text/* @mauritskorse
 esphome/components/thermostat/* @kbx81
 esphome/components/time/* @OttoWinter
 esphome/components/tlc5947/* @rnauber
diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index 69765c7a94..ca3071d6d9 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -39,6 +39,7 @@ service APIConnection {
   rpc camera_image (CameraImageRequest) returns (void) {}
   rpc climate_command (ClimateCommandRequest) returns (void) {}
   rpc number_command (NumberCommandRequest) returns (void) {}
+  rpc text_command (TextCommandRequest) returns (void) {}
   rpc select_command (SelectCommandRequest) returns (void) {}
   rpc button_command (ButtonCommandRequest) returns (void) {}
   rpc lock_command (LockCommandRequest) returns (void) {}
@@ -1536,3 +1537,48 @@ message AlarmControlPanelCommandRequest {
   AlarmControlPanelStateCommand command = 2;
   string code = 3;
 }
+
+// ===================== TEXT =====================
+enum TextMode {
+  TEXT_MODE_TEXT = 0;
+  TEXT_MODE_PASSWORD = 1;
+}
+message ListEntitiesTextResponse {
+  option (id) = 97;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_TEXT";
+
+  string object_id = 1;
+  fixed32 key = 2;
+  string name = 3;
+  string unique_id = 4;
+  string icon = 5;
+  bool disabled_by_default = 6;
+  EntityCategory entity_category = 7;
+
+  uint32 min_length = 8;
+  uint32 max_length = 9;
+  string pattern = 10;
+  TextMode mode = 11;
+}
+message TextStateResponse {
+  option (id) = 98;
+  option (source) = SOURCE_SERVER;
+  option (ifdef) = "USE_TEXT";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  string state = 2;
+  // If the Text does not have a valid state yet.
+  // Equivalent to `!obj->has_state()` - inverse logic to make state packets smaller
+  bool missing_state = 3;
+}
+message TextCommandRequest {
+  option (id) = 99;
+  option (source) = SOURCE_CLIENT;
+  option (ifdef) = "USE_TEXT";
+  option (no_delay) = true;
+
+  fixed32 key = 1;
+  string state = 2;
+}
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 3172b71fa2..bc61271e93 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1,6 +1,7 @@
 #include "api_connection.h"
 #include <cerrno>
 #include <cinttypes>
+#include <utility>
 #include "esphome/components/network/util.h"
 #include "esphome/core/entity_base.h"
 #include "esphome/core/hal.h"
@@ -655,6 +656,44 @@ void APIConnection::number_command(const NumberCommandRequest &msg) {
 }
 #endif
 
+#ifdef USE_TEXT
+bool APIConnection::send_text_state(text::Text *text, std::string state) {
+  if (!this->state_subscription_)
+    return false;
+
+  TextStateResponse resp{};
+  resp.key = text->get_object_id_hash();
+  resp.state = std::move(state);
+  resp.missing_state = !text->has_state();
+  return this->send_text_state_response(resp);
+}
+bool APIConnection::send_text_info(text::Text *text) {
+  ListEntitiesTextResponse msg;
+  msg.key = text->get_object_id_hash();
+  msg.object_id = text->get_object_id();
+  msg.name = text->get_name();
+  msg.icon = text->get_icon();
+  msg.disabled_by_default = text->is_disabled_by_default();
+  msg.entity_category = static_cast<enums::EntityCategory>(text->get_entity_category());
+  msg.mode = static_cast<enums::TextMode>(text->traits.get_mode());
+
+  msg.min_length = text->traits.get_min_length();
+  msg.max_length = text->traits.get_max_length();
+  msg.pattern = text->traits.get_pattern();
+
+  return this->send_list_entities_text_response(msg);
+}
+void APIConnection::text_command(const TextCommandRequest &msg) {
+  text::Text *text = App.get_text_by_key(msg.key);
+  if (text == nullptr)
+    return;
+
+  auto call = text->make_call();
+  call.set_value(msg.state);
+  call.perform();
+}
+#endif
+
 #ifdef USE_SELECT
 bool APIConnection::send_select_state(select::Select *select, std::string state) {
   if (!this->state_subscription_)
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 2a62c2faff..c17aaab611 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -72,6 +72,11 @@ class APIConnection : public APIServerConnection {
   bool send_number_info(number::Number *number);
   void number_command(const NumberCommandRequest &msg) override;
 #endif
+#ifdef USE_TEXT
+  bool send_text_state(text::Text *text, std::string state);
+  bool send_text_info(text::Text *text);
+  void text_command(const TextCommandRequest &msg) override;
+#endif
 #ifdef USE_SELECT
   bool send_select_state(select::Select *select, std::string state);
   bool send_select_info(select::Select *select);
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index 65df2312e1..c070b3c988 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -512,6 +512,18 @@ const char *proto_enum_to_string<enums::AlarmControlPanelStateCommand>(enums::Al
   }
 }
 #endif
+#ifdef HAS_PROTO_MESSAGE_DUMP
+template<> const char *proto_enum_to_string<enums::TextMode>(enums::TextMode value) {
+  switch (value) {
+    case enums::TEXT_MODE_TEXT:
+      return "TEXT_MODE_TEXT";
+    case enums::TEXT_MODE_PASSWORD:
+      return "TEXT_MODE_PASSWORD";
+    default:
+      return "UNKNOWN";
+  }
+}
+#endif
 bool HelloRequest::decode_varint(uint32_t field_id, ProtoVarInt value) {
   switch (field_id) {
     case 2: {
@@ -6795,6 +6807,227 @@ void AlarmControlPanelCommandRequest::dump_to(std::string &out) const {
   out.append("}");
 }
 #endif
+bool ListEntitiesTextResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 6: {
+      this->disabled_by_default = value.as_bool();
+      return true;
+    }
+    case 7: {
+      this->entity_category = value.as_enum<enums::EntityCategory>();
+      return true;
+    }
+    case 8: {
+      this->min_length = value.as_uint32();
+      return true;
+    }
+    case 9: {
+      this->max_length = value.as_uint32();
+      return true;
+    }
+    case 11: {
+      this->mode = value.as_enum<enums::TextMode>();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesTextResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 1: {
+      this->object_id = value.as_string();
+      return true;
+    }
+    case 3: {
+      this->name = value.as_string();
+      return true;
+    }
+    case 4: {
+      this->unique_id = value.as_string();
+      return true;
+    }
+    case 5: {
+      this->icon = value.as_string();
+      return true;
+    }
+    case 10: {
+      this->pattern = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool ListEntitiesTextResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 2: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void ListEntitiesTextResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_string(1, this->object_id);
+  buffer.encode_fixed32(2, this->key);
+  buffer.encode_string(3, this->name);
+  buffer.encode_string(4, this->unique_id);
+  buffer.encode_string(5, this->icon);
+  buffer.encode_bool(6, this->disabled_by_default);
+  buffer.encode_enum<enums::EntityCategory>(7, this->entity_category);
+  buffer.encode_uint32(8, this->min_length);
+  buffer.encode_uint32(9, this->max_length);
+  buffer.encode_string(10, this->pattern);
+  buffer.encode_enum<enums::TextMode>(11, this->mode);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void ListEntitiesTextResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("ListEntitiesTextResponse {\n");
+  out.append("  object_id: ");
+  out.append("'").append(this->object_id).append("'");
+  out.append("\n");
+
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  name: ");
+  out.append("'").append(this->name).append("'");
+  out.append("\n");
+
+  out.append("  unique_id: ");
+  out.append("'").append(this->unique_id).append("'");
+  out.append("\n");
+
+  out.append("  icon: ");
+  out.append("'").append(this->icon).append("'");
+  out.append("\n");
+
+  out.append("  disabled_by_default: ");
+  out.append(YESNO(this->disabled_by_default));
+  out.append("\n");
+
+  out.append("  entity_category: ");
+  out.append(proto_enum_to_string<enums::EntityCategory>(this->entity_category));
+  out.append("\n");
+
+  out.append("  min_length: ");
+  sprintf(buffer, "%" PRIu32, this->min_length);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  max_length: ");
+  sprintf(buffer, "%" PRIu32, this->max_length);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  pattern: ");
+  out.append("'").append(this->pattern).append("'");
+  out.append("\n");
+
+  out.append("  mode: ");
+  out.append(proto_enum_to_string<enums::TextMode>(this->mode));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool TextStateResponse::decode_varint(uint32_t field_id, ProtoVarInt value) {
+  switch (field_id) {
+    case 3: {
+      this->missing_state = value.as_bool();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool TextStateResponse::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->state = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool TextStateResponse::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void TextStateResponse::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_string(2, this->state);
+  buffer.encode_bool(3, this->missing_state);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void TextStateResponse::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("TextStateResponse {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  state: ");
+  out.append("'").append(this->state).append("'");
+  out.append("\n");
+
+  out.append("  missing_state: ");
+  out.append(YESNO(this->missing_state));
+  out.append("\n");
+  out.append("}");
+}
+#endif
+bool TextCommandRequest::decode_length(uint32_t field_id, ProtoLengthDelimited value) {
+  switch (field_id) {
+    case 2: {
+      this->state = value.as_string();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+bool TextCommandRequest::decode_32bit(uint32_t field_id, Proto32Bit value) {
+  switch (field_id) {
+    case 1: {
+      this->key = value.as_fixed32();
+      return true;
+    }
+    default:
+      return false;
+  }
+}
+void TextCommandRequest::encode(ProtoWriteBuffer buffer) const {
+  buffer.encode_fixed32(1, this->key);
+  buffer.encode_string(2, this->state);
+}
+#ifdef HAS_PROTO_MESSAGE_DUMP
+void TextCommandRequest::dump_to(std::string &out) const {
+  __attribute__((unused)) char buffer[64];
+  out.append("TextCommandRequest {\n");
+  out.append("  key: ");
+  sprintf(buffer, "%" PRIu32, this->key);
+  out.append(buffer);
+  out.append("\n");
+
+  out.append("  state: ");
+  out.append("'").append(this->state).append("'");
+  out.append("\n");
+  out.append("}");
+}
+#endif
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index 4c70facf3d..b935784831 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -208,6 +208,10 @@ enum AlarmControlPanelStateCommand : uint32_t {
   ALARM_CONTROL_PANEL_ARM_CUSTOM_BYPASS = 5,
   ALARM_CONTROL_PANEL_TRIGGER = 6,
 };
+enum TextMode : uint32_t {
+  TEXT_MODE_TEXT = 0,
+  TEXT_MODE_PASSWORD = 1,
+};
 
 }  // namespace enums
 
@@ -1778,6 +1782,57 @@ class AlarmControlPanelCommandRequest : public ProtoMessage {
   bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
   bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
 };
+class ListEntitiesTextResponse : public ProtoMessage {
+ public:
+  std::string object_id{};
+  uint32_t key{0};
+  std::string name{};
+  std::string unique_id{};
+  std::string icon{};
+  bool disabled_by_default{false};
+  enums::EntityCategory entity_category{};
+  uint32_t min_length{0};
+  uint32_t max_length{0};
+  std::string pattern{};
+  enums::TextMode mode{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class TextStateResponse : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  std::string state{};
+  bool missing_state{false};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+  bool decode_varint(uint32_t field_id, ProtoVarInt value) override;
+};
+class TextCommandRequest : public ProtoMessage {
+ public:
+  uint32_t key{0};
+  std::string state{};
+  void encode(ProtoWriteBuffer buffer) const override;
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  void dump_to(std::string &out) const override;
+#endif
+
+ protected:
+  bool decode_32bit(uint32_t field_id, Proto32Bit value) override;
+  bool decode_length(uint32_t field_id, ProtoLengthDelimited value) override;
+};
 
 }  // namespace api
 }  // namespace esphome
diff --git a/esphome/components/api/api_pb2_service.cpp b/esphome/components/api/api_pb2_service.cpp
index 8752ae6cfd..4c49c09c8e 100644
--- a/esphome/components/api/api_pb2_service.cpp
+++ b/esphome/components/api/api_pb2_service.cpp
@@ -495,6 +495,24 @@ bool APIServerConnectionBase::send_alarm_control_panel_state_response(const Alar
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
 #endif
+#ifdef USE_TEXT
+bool APIServerConnectionBase::send_list_entities_text_response(const ListEntitiesTextResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_list_entities_text_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<ListEntitiesTextResponse>(msg, 97);
+}
+#endif
+#ifdef USE_TEXT
+bool APIServerConnectionBase::send_text_state_response(const TextStateResponse &msg) {
+#ifdef HAS_PROTO_MESSAGE_DUMP
+  ESP_LOGVV(TAG, "send_text_state_response: %s", msg.dump().c_str());
+#endif
+  return this->send_message_<TextStateResponse>(msg, 98);
+}
+#endif
+#ifdef USE_TEXT
+#endif
 bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) {
   switch (msg_type) {
     case 1: {
@@ -913,6 +931,17 @@ bool APIServerConnectionBase::read_message(uint32_t msg_size, uint32_t msg_type,
       ESP_LOGVV(TAG, "on_alarm_control_panel_command_request: %s", msg.dump().c_str());
 #endif
       this->on_alarm_control_panel_command_request(msg);
+#endif
+      break;
+    }
+    case 99: {
+#ifdef USE_TEXT
+      TextCommandRequest msg;
+      msg.decode(msg_data, msg_size);
+#ifdef HAS_PROTO_MESSAGE_DUMP
+      ESP_LOGVV(TAG, "on_text_command_request: %s", msg.dump().c_str());
+#endif
+      this->on_text_command_request(msg);
 #endif
       break;
     }
@@ -1124,6 +1153,19 @@ void APIServerConnection::on_number_command_request(const NumberCommandRequest &
   this->number_command(msg);
 }
 #endif
+#ifdef USE_TEXT
+void APIServerConnection::on_text_command_request(const TextCommandRequest &msg) {
+  if (!this->is_connection_setup()) {
+    this->on_no_setup_connection();
+    return;
+  }
+  if (!this->is_authenticated()) {
+    this->on_unauthenticated_access();
+    return;
+  }
+  this->text_command(msg);
+}
+#endif
 #ifdef USE_SELECT
 void APIServerConnection::on_select_command_request(const SelectCommandRequest &msg) {
   if (!this->is_connection_setup()) {
diff --git a/esphome/components/api/api_pb2_service.h b/esphome/components/api/api_pb2_service.h
index 2864e303c0..20639fc139 100644
--- a/esphome/components/api/api_pb2_service.h
+++ b/esphome/components/api/api_pb2_service.h
@@ -248,6 +248,15 @@ class APIServerConnectionBase : public ProtoService {
 #endif
 #ifdef USE_ALARM_CONTROL_PANEL
   virtual void on_alarm_control_panel_command_request(const AlarmControlPanelCommandRequest &value){};
+#endif
+#ifdef USE_TEXT
+  bool send_list_entities_text_response(const ListEntitiesTextResponse &msg);
+#endif
+#ifdef USE_TEXT
+  bool send_text_state_response(const TextStateResponse &msg);
+#endif
+#ifdef USE_TEXT
+  virtual void on_text_command_request(const TextCommandRequest &value){};
 #endif
  protected:
   bool read_message(uint32_t msg_size, uint32_t msg_type, uint8_t *msg_data) override;
@@ -288,6 +297,9 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_NUMBER
   virtual void number_command(const NumberCommandRequest &msg) = 0;
 #endif
+#ifdef USE_TEXT
+  virtual void text_command(const TextCommandRequest &msg) = 0;
+#endif
 #ifdef USE_SELECT
   virtual void select_command(const SelectCommandRequest &msg) = 0;
 #endif
@@ -371,6 +383,9 @@ class APIServerConnection : public APIServerConnectionBase {
 #ifdef USE_NUMBER
   void on_number_command_request(const NumberCommandRequest &msg) override;
 #endif
+#ifdef USE_TEXT
+  void on_text_command_request(const TextCommandRequest &msg) override;
+#endif
 #ifdef USE_SELECT
   void on_select_command_request(const SelectCommandRequest &msg) override;
 #endif
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 54266ff0f0..c4edddc92b 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -254,6 +254,15 @@ void APIServer::on_number_update(number::Number *obj, float state) {
 }
 #endif
 
+#ifdef USE_TEXT
+void APIServer::on_text_update(text::Text *obj, const std::string &state) {
+  if (obj->is_internal())
+    return;
+  for (auto &c : this->clients_)
+    c->send_text_state(obj, state);
+}
+#endif
+
 #ifdef USE_SELECT
 void APIServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
   if (obj->is_internal())
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index a4454d4b84..4d359ebb79 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -65,6 +65,9 @@ class APIServer : public Component, public Controller {
 #ifdef USE_NUMBER
   void on_number_update(number::Number *obj, float state) override;
 #endif
+#ifdef USE_TEXT
+  void on_text_update(text::Text *obj, const std::string &state) override;
+#endif
 #ifdef USE_SELECT
   void on_select_update(select::Select *obj, const std::string &state, size_t index) override;
 #endif
diff --git a/esphome/components/api/list_entities.cpp b/esphome/components/api/list_entities.cpp
index cd73d1ef5d..fe359143b1 100644
--- a/esphome/components/api/list_entities.cpp
+++ b/esphome/components/api/list_entities.cpp
@@ -60,6 +60,10 @@ bool ListEntitiesIterator::on_climate(climate::Climate *climate) { return this->
 bool ListEntitiesIterator::on_number(number::Number *number) { return this->client_->send_number_info(number); }
 #endif
 
+#ifdef USE_TEXT
+bool ListEntitiesIterator::on_text(text::Text *text) { return this->client_->send_text_info(text); }
+#endif
+
 #ifdef USE_SELECT
 bool ListEntitiesIterator::on_select(select::Select *select) { return this->client_->send_select_info(select); }
 #endif
diff --git a/esphome/components/api/list_entities.h b/esphome/components/api/list_entities.h
index b40d77e841..e19c0d99f0 100644
--- a/esphome/components/api/list_entities.h
+++ b/esphome/components/api/list_entities.h
@@ -46,6 +46,9 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
+#ifdef USE_TEXT
+  bool on_text(text::Text *text) override;
+#endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
 #endif
diff --git a/esphome/components/api/subscribe_state.cpp b/esphome/components/api/subscribe_state.cpp
index 66b5f40928..aff156cafd 100644
--- a/esphome/components/api/subscribe_state.cpp
+++ b/esphome/components/api/subscribe_state.cpp
@@ -42,6 +42,9 @@ bool InitialStateIterator::on_number(number::Number *number) {
   return this->client_->send_number_state(number, number->state);
 }
 #endif
+#ifdef USE_TEXT
+bool InitialStateIterator::on_text(text::Text *text) { return this->client_->send_text_state(text, text->state); }
+#endif
 #ifdef USE_SELECT
 bool InitialStateIterator::on_select(select::Select *select) {
   return this->client_->send_select_state(select, select->state);
diff --git a/esphome/components/api/subscribe_state.h b/esphome/components/api/subscribe_state.h
index 0597b9f384..1f27387cf2 100644
--- a/esphome/components/api/subscribe_state.h
+++ b/esphome/components/api/subscribe_state.h
@@ -43,6 +43,9 @@ class InitialStateIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
+#ifdef USE_TEXT
+  bool on_text(text::Text *text) override;
+#endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
 #endif
diff --git a/esphome/components/copy/text/__init__.py b/esphome/components/copy/text/__init__.py
new file mode 100644
index 0000000000..7593789250
--- /dev/null
+++ b/esphome/components/copy/text/__init__.py
@@ -0,0 +1,36 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text
+from esphome.const import (
+    CONF_ENTITY_CATEGORY,
+    CONF_ICON,
+    CONF_MODE,
+    CONF_SOURCE_ID,
+)
+from esphome.core.entity_helpers import inherit_property_from
+
+from .. import copy_ns
+
+CopyText = copy_ns.class_("CopyText", text.Text, cg.Component)
+
+
+CONFIG_SCHEMA = text.TEXT_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(CopyText),
+        cv.Required(CONF_SOURCE_ID): cv.use_id(text.Text),
+    }
+).extend(cv.COMPONENT_SCHEMA)
+
+FINAL_VALIDATE_SCHEMA = cv.All(
+    inherit_property_from(CONF_ICON, CONF_SOURCE_ID),
+    inherit_property_from(CONF_ENTITY_CATEGORY, CONF_SOURCE_ID),
+    inherit_property_from(CONF_MODE, CONF_SOURCE_ID),
+)
+
+
+async def to_code(config):
+    var = await text.new_text(config)
+    await cg.register_component(var, config)
+
+    source = await cg.get_variable(config[CONF_SOURCE_ID])
+    cg.add(var.set_source(source))
diff --git a/esphome/components/copy/text/copy_text.cpp b/esphome/components/copy/text/copy_text.cpp
new file mode 100644
index 0000000000..cb74201383
--- /dev/null
+++ b/esphome/components/copy/text/copy_text.cpp
@@ -0,0 +1,25 @@
+#include "copy_text.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace copy {
+
+static const char *const TAG = "copy.text";
+
+void CopyText::setup() {
+  source_->add_on_state_callback([this](const std::string &value) { this->publish_state(value); });
+
+  if (source_->has_state())
+    this->publish_state(source_->state);
+}
+
+void CopyText::dump_config() { LOG_TEXT("", "Copy Text", this); }
+
+void CopyText::control(const std::string &value) {
+  auto call2 = source_->make_call();
+  call2.set_value(value);
+  call2.perform();
+}
+
+}  // namespace copy
+}  // namespace esphome
diff --git a/esphome/components/copy/text/copy_text.h b/esphome/components/copy/text/copy_text.h
new file mode 100644
index 0000000000..beb8610dfe
--- /dev/null
+++ b/esphome/components/copy/text/copy_text.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/text/text.h"
+
+namespace esphome {
+namespace copy {
+
+class CopyText : public text::Text, public Component {
+ public:
+  void set_source(text::Text *source) { source_ = source; }
+  void setup() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+ protected:
+  void control(const std::string &value) override;
+
+  text::Text *source_;
+};
+
+}  // namespace copy
+}  // namespace esphome
diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 2d1a3dc5fd..6d0846edad 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -111,6 +111,7 @@ MQTTSensorComponent = mqtt_ns.class_("MQTTSensorComponent", MQTTComponent)
 MQTTSwitchComponent = mqtt_ns.class_("MQTTSwitchComponent", MQTTComponent)
 MQTTTextSensor = mqtt_ns.class_("MQTTTextSensor", MQTTComponent)
 MQTTNumberComponent = mqtt_ns.class_("MQTTNumberComponent", MQTTComponent)
+MQTTTextComponent = mqtt_ns.class_("MQTTTextComponent", MQTTComponent)
 MQTTSelectComponent = mqtt_ns.class_("MQTTSelectComponent", MQTTComponent)
 MQTTButtonComponent = mqtt_ns.class_("MQTTButtonComponent", MQTTComponent)
 MQTTLockComponent = mqtt_ns.class_("MQTTLockComponent", MQTTComponent)
diff --git a/esphome/components/mqtt/mqtt_text.cpp b/esphome/components/mqtt/mqtt_text.cpp
new file mode 100644
index 0000000000..58978faead
--- /dev/null
+++ b/esphome/components/mqtt/mqtt_text.cpp
@@ -0,0 +1,63 @@
+#include "mqtt_text.h"
+#include "esphome/core/log.h"
+
+#include "mqtt_const.h"
+
+#ifdef USE_MQTT
+#ifdef USE_TEXT
+
+namespace esphome {
+namespace mqtt {
+
+static const char *const TAG = "mqtt.text";
+
+using namespace esphome::text;
+
+MQTTTextComponent::MQTTTextComponent(Text *text) : text_(text) {}
+
+void MQTTTextComponent::setup() {
+  this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &state) {
+    auto call = this->text_->make_call();
+    call.set_value(state);
+    call.perform();
+  });
+
+  this->text_->add_on_state_callback([this](const std::string &state) { this->publish_state(state); });
+}
+
+void MQTTTextComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "MQTT text '%s':", this->text_->get_name().c_str());
+  LOG_MQTT_COMPONENT(true, false)
+}
+
+std::string MQTTTextComponent::component_type() const { return "text"; }
+const EntityBase *MQTTTextComponent::get_entity() const { return this->text_; }
+
+void MQTTTextComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) {
+  switch (this->text_->traits.get_mode()) {
+    case TEXT_MODE_TEXT:
+      root[MQTT_MODE] = "text";
+      break;
+    case TEXT_MODE_PASSWORD:
+      root[MQTT_MODE] = "password";
+      break;
+  }
+
+  config.command_topic = true;
+}
+bool MQTTTextComponent::send_initial_state() {
+  if (this->text_->has_state()) {
+    return this->publish_state(this->text_->state);
+  } else {
+    return true;
+  }
+}
+bool MQTTTextComponent::publish_state(const std::string &value) {
+  return this->publish(this->get_state_topic_(), value);
+}
+
+}  // namespace mqtt
+}  // namespace esphome
+
+#endif
+#endif  // USE_MQTT
diff --git a/esphome/components/mqtt/mqtt_text.h b/esphome/components/mqtt/mqtt_text.h
new file mode 100644
index 0000000000..d9486fcbf8
--- /dev/null
+++ b/esphome/components/mqtt/mqtt_text.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "esphome/core/defines.h"
+
+#ifdef USE_MQTT
+#ifdef USE_TEXT
+
+#include "esphome/components/text/text.h"
+#include "mqtt_component.h"
+
+namespace esphome {
+namespace mqtt {
+
+class MQTTTextComponent : public mqtt::MQTTComponent {
+ public:
+  /** Construct this MQTTTextComponent instance with the provided friendly_name and text
+   *
+   * @param text The text input.
+   */
+  explicit MQTTTextComponent(text::Text *text);
+
+  // ========== INTERNAL METHODS ==========
+  // (In most use cases you won't need these)
+  /// Override setup.
+  void setup() override;
+  void dump_config() override;
+
+  void send_discovery(JsonObject root, mqtt::SendDiscoveryConfig &config) override;
+
+  bool send_initial_state() override;
+
+  bool publish_state(const std::string &value);
+
+ protected:
+  /// Override for MQTTComponent, returns "text".
+  std::string component_type() const override;
+  const EntityBase *get_entity() const override;
+
+  text::Text *text_;
+};
+
+}  // namespace mqtt
+}  // namespace esphome
+
+#endif
+#endif  // USE_MQTT
diff --git a/esphome/components/sprinkler/__init__.py b/esphome/components/sprinkler/__init__.py
index 02c80ad5a0..e5bcf681f4 100644
--- a/esphome/components/sprinkler/__init__.py
+++ b/esphome/components/sprinkler/__init__.py
@@ -19,6 +19,7 @@ from esphome.const import (
     ENTITY_CATEGORY_CONFIG,
     UNIT_MINUTE,
     UNIT_SECOND,
+    CONF_SET_ACTION,
 )
 
 AUTO_LOAD = ["number", "switch"]
@@ -46,7 +47,6 @@ CONF_QUEUE_ENABLE_SWITCH = "queue_enable_switch"
 CONF_REPEAT_NUMBER = "repeat_number"
 CONF_REVERSE_SWITCH = "reverse_switch"
 CONF_RUN_DURATION_NUMBER = "run_duration_number"
-CONF_SET_ACTION = "set_action"
 CONF_STANDBY_SWITCH = "standby_switch"
 CONF_VALVE_NUMBER = "valve_number"
 CONF_VALVE_OPEN_DELAY = "valve_open_delay"
diff --git a/esphome/components/template/number/__init__.py b/esphome/components/template/number/__init__.py
index b9a507c7e9..c6ed25adda 100644
--- a/esphome/components/template/number/__init__.py
+++ b/esphome/components/template/number/__init__.py
@@ -11,6 +11,7 @@ from esphome.const import (
     CONF_OPTIMISTIC,
     CONF_RESTORE_VALUE,
     CONF_STEP,
+    CONF_SET_ACTION,
 )
 from .. import template_ns
 
@@ -18,8 +19,6 @@ TemplateNumber = template_ns.class_(
     "TemplateNumber", number.Number, cg.PollingComponent
 )
 
-CONF_SET_ACTION = "set_action"
-
 
 def validate_min_max(config):
     if config[CONF_MAX_VALUE] <= config[CONF_MIN_VALUE]:
diff --git a/esphome/components/template/select/__init__.py b/esphome/components/template/select/__init__.py
index d116cbb8ae..75dbd4f5c5 100644
--- a/esphome/components/template/select/__init__.py
+++ b/esphome/components/template/select/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_OPTIONS,
     CONF_OPTIMISTIC,
     CONF_RESTORE_VALUE,
+    CONF_SET_ACTION,
 )
 from .. import template_ns
 
@@ -16,8 +17,6 @@ TemplateSelect = template_ns.class_(
     "TemplateSelect", select.Select, cg.PollingComponent
 )
 
-CONF_SET_ACTION = "set_action"
-
 
 def validate(config):
     if CONF_LAMBDA in config:
diff --git a/esphome/components/template/text/__init__.py b/esphome/components/template/text/__init__.py
new file mode 100644
index 0000000000..a82664ee15
--- /dev/null
+++ b/esphome/components/template/text/__init__.py
@@ -0,0 +1,92 @@
+from esphome import automation
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text
+from esphome.const import (
+    CONF_INITIAL_VALUE,
+    CONF_LAMBDA,
+    CONF_OPTIMISTIC,
+    CONF_RESTORE_VALUE,
+    CONF_MAX_LENGTH,
+    CONF_MIN_LENGTH,
+    CONF_PATTERN,
+    CONF_SET_ACTION,
+)
+from .. import template_ns
+
+TemplateText = template_ns.class_("TemplateText", text.Text, cg.PollingComponent)
+
+TextSaverBase = template_ns.class_("TemplateTextSaverBase")
+TextSaverTemplate = template_ns.class_("TextSaver", TextSaverBase)
+
+CONF_MAX_RESTORE_DATA_LENGTH = "max_restore_data_length"
+
+
+def validate(config):
+    if CONF_LAMBDA in config:
+        if config[CONF_OPTIMISTIC]:
+            raise cv.Invalid("optimistic cannot be used with lambda")
+        if CONF_INITIAL_VALUE in config:
+            raise cv.Invalid("initial_value cannot be used with lambda")
+        if CONF_RESTORE_VALUE in config:
+            raise cv.Invalid("restore_value cannot be used with lambda")
+    elif CONF_INITIAL_VALUE not in config:
+        config[CONF_INITIAL_VALUE] = ""
+
+    if not config[CONF_OPTIMISTIC] and CONF_SET_ACTION not in config:
+        raise cv.Invalid(
+            "Either optimistic mode must be enabled, or set_action must be set, to handle the text input being set."
+        )
+
+    with cv.prepend_path(CONF_MIN_LENGTH):
+        if config[CONF_MIN_LENGTH] >= config[CONF_MAX_LENGTH]:
+            raise cv.Invalid("min_length must be less than max_length")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    text.TEXT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(TemplateText),
+            cv.Optional(CONF_MIN_LENGTH, default=0): cv.int_range(min=0, max=255),
+            cv.Optional(CONF_MAX_LENGTH, default=255): cv.int_range(min=0, max=255),
+            cv.Optional(CONF_PATTERN): cv.string,
+            cv.Optional(CONF_LAMBDA): cv.returning_lambda,
+            cv.Optional(CONF_OPTIMISTIC, default=False): cv.boolean,
+            cv.Optional(CONF_SET_ACTION): automation.validate_automation(single=True),
+            cv.Optional(CONF_INITIAL_VALUE): cv.string_strict,
+            cv.Optional(CONF_RESTORE_VALUE, default=False): cv.boolean,
+        }
+    ).extend(cv.polling_component_schema("60s")),
+    validate,
+)
+
+
+async def to_code(config):
+    var = await text.new_text(
+        config,
+        min_length=config[CONF_MIN_LENGTH],
+        max_length=config[CONF_MAX_LENGTH],
+        pattern=config.get(CONF_PATTERN),
+    )
+    await cg.register_component(var, config)
+
+    if CONF_LAMBDA in config:
+        template_ = await cg.process_lambda(
+            config[CONF_LAMBDA], [], return_type=cg.optional.template(cg.std_string)
+        )
+        cg.add(var.set_template(template_))
+
+    else:
+        cg.add(var.set_optimistic(config[CONF_OPTIMISTIC]))
+        if initial_value_config := config.get(CONF_INITIAL_VALUE):
+            cg.add(var.set_initial_value(initial_value_config))
+        if config[CONF_RESTORE_VALUE]:
+            args = cg.TemplateArguments(config[CONF_MAX_LENGTH])
+            saver = TextSaverTemplate.template(args).new()
+            cg.add(var.set_value_saver(saver))
+
+    if CONF_SET_ACTION in config:
+        await automation.build_automation(
+            var.get_set_trigger(), [(cg.std_string, "x")], config[CONF_SET_ACTION]
+        )
diff --git a/esphome/components/template/text/template_text.cpp b/esphome/components/template/text/template_text.cpp
new file mode 100644
index 0000000000..fb0208e198
--- /dev/null
+++ b/esphome/components/template/text/template_text.cpp
@@ -0,0 +1,64 @@
+#include "template_text.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace template_ {
+
+static const char *const TAG = "template.text";
+
+void TemplateText::setup() {
+  if (!(this->f_ == nullptr)) {
+    if (this->f_.has_value())
+      return;
+  }
+
+  std::string value;
+  ESP_LOGD(TAG, "Setting up Template Text Input");
+  value = this->initial_value_;
+  if (!this->pref_) {
+    ESP_LOGD(TAG, "State from initial: %s", value.c_str());
+  } else {
+    uint32_t key = this->get_object_id_hash();
+    key += this->traits.get_min_length() << 2;
+    key += this->traits.get_max_length() << 4;
+    key += fnv1_hash(this->traits.get_pattern()) << 6;
+    this->pref_->setup(key, value);
+  }
+  if (!value.empty())
+    this->publish_state(value);
+}
+
+void TemplateText::update() {
+  if (this->f_ == nullptr)
+    return;
+
+  if (!this->f_.has_value())
+    return;
+
+  auto val = (*this->f_)();
+  if (!val.has_value())
+    return;
+
+  this->publish_state(*val);
+}
+
+void TemplateText::control(const std::string &value) {
+  this->set_trigger_->trigger(value);
+
+  if (this->optimistic_)
+    this->publish_state(value);
+
+  if (this->pref_) {
+    if (!this->pref_->save(value)) {
+      ESP_LOGW(TAG, "Text value too long to save");
+    }
+  }
+}
+void TemplateText::dump_config() {
+  LOG_TEXT("", "Template Text Input", this);
+  ESP_LOGCONFIG(TAG, "  Optimistic: %s", YESNO(this->optimistic_));
+  LOG_UPDATE_INTERVAL(this);
+}
+
+}  // namespace template_
+}  // namespace esphome
diff --git a/esphome/components/template/text/template_text.h b/esphome/components/template/text/template_text.h
new file mode 100644
index 0000000000..bcfc54a2ba
--- /dev/null
+++ b/esphome/components/template/text/template_text.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include "esphome/components/text/text.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "esphome/core/preferences.h"
+
+namespace esphome {
+namespace template_ {
+
+// We keep this separate so we don't have to template and duplicate
+// the text input for each different size flash allocation.
+class TemplateTextSaverBase {
+ public:
+  virtual bool save(const std::string &value) { return true; }
+
+  virtual void setup(uint32_t id, std::string &value) {}
+
+ protected:
+  ESPPreferenceObject pref_;
+  std::string prev_;
+};
+
+template<uint8_t SZ> class TextSaver : public TemplateTextSaverBase {
+ public:
+  bool save(const std::string &value) override {
+    int diff = value.compare(this->prev_);
+    if (diff != 0) {
+      // If string is bigger than the allocation, do not save it.
+      // We don't need to waste ram setting prev_value either.
+      int size = value.size();
+      if (size <= SZ) {
+        // Make it into a length prefixed thing
+        unsigned char temp[SZ + 1];
+        memcpy(temp + 1, value.c_str(), size);
+        // SZ should be pre checked at the schema level, it can't go past the char range.
+        temp[0] = ((unsigned char) size);
+        this->pref_.save(&temp);
+        this->prev_.assign(value);
+        return true;
+      }
+    }
+    return false;
+  }
+
+  // Make the preference object.  Fill the provided location with the saved data
+  // If it is available, else leave it alone
+  void setup(uint32_t id, std::string &value) override {
+    this->pref_ = global_preferences->make_preference<uint8_t[SZ + 1]>(id);
+
+    char temp[SZ + 1];
+    bool hasdata = this->pref_.load(&temp);
+
+    if (hasdata) {
+      value.assign(temp + 1, (size_t) temp[0]);
+    }
+
+    this->prev_.assign(value);
+  }
+};
+
+class TemplateText : public text::Text, public PollingComponent {
+ public:
+  void set_template(std::function<optional<std::string>()> &&f) { this->f_ = f; }
+
+  void setup() override;
+  void update() override;
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::HARDWARE; }
+
+  Trigger<std::string> *get_set_trigger() const { return this->set_trigger_; }
+  void set_optimistic(bool optimistic) { this->optimistic_ = optimistic; }
+  void set_initial_value(const std::string &initial_value) { this->initial_value_ = initial_value; }
+  void set_value_saver(TemplateTextSaverBase *restore_value_saver) { this->pref_ = restore_value_saver; }
+
+ protected:
+  void control(const std::string &value) override;
+  bool optimistic_ = false;
+  std::string initial_value_;
+  Trigger<std::string> *set_trigger_ = new Trigger<std::string>();
+  optional<std::function<optional<std::string>()>> f_{nullptr};
+
+  TemplateTextSaverBase *pref_ = nullptr;
+};
+
+}  // namespace template_
+}  // namespace esphome
diff --git a/esphome/components/text/__init__.py b/esphome/components/text/__init__.py
new file mode 100644
index 0000000000..21c23ce73b
--- /dev/null
+++ b/esphome/components/text/__init__.py
@@ -0,0 +1,138 @@
+from typing import Optional
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome.components import mqtt
+from esphome.const import (
+    CONF_ID,
+    CONF_MODE,
+    CONF_ON_VALUE,
+    CONF_TRIGGER_ID,
+    CONF_MQTT_ID,
+    CONF_VALUE,
+)
+
+from esphome.core import CORE, coroutine_with_priority
+from esphome.cpp_helpers import setup_entity
+
+CODEOWNERS = ["@mauritskorse"]
+IS_PLATFORM_COMPONENT = True
+
+text_ns = cg.esphome_ns.namespace("text")
+Text = text_ns.class_("Text", cg.EntityBase)
+TextPtr = Text.operator("ptr")
+
+# Triggers
+TextStateTrigger = text_ns.class_(
+    "TextStateTrigger", automation.Trigger.template(cg.std_string)
+)
+
+# Actions
+TextSetAction = text_ns.class_("TextSetAction", automation.Action)
+
+# Conditions
+TextMode = text_ns.enum("TextMode")
+
+TEXT_MODES = {
+    "TEXT": TextMode.TEXT_MODE_TEXT,
+    "PASSWORD": TextMode.TEXT_MODE_PASSWORD,  # to be implemented for keys, passwords, etc.
+}
+
+TEXT_SCHEMA = cv.ENTITY_BASE_SCHEMA.extend(cv.MQTT_COMPONENT_SCHEMA).extend(
+    {
+        cv.OnlyWith(CONF_MQTT_ID, "mqtt"): cv.declare_id(mqtt.MQTTTextComponent),
+        cv.GenerateID(): cv.declare_id(Text),
+        cv.Optional(CONF_ON_VALUE): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(TextStateTrigger),
+            }
+        ),
+        cv.Required(CONF_MODE): cv.enum(TEXT_MODES, upper=True),
+    }
+)
+
+
+async def setup_text_core_(
+    var,
+    config,
+    *,
+    min_length: Optional[int],
+    max_length: Optional[int],
+    pattern: Optional[str],
+):
+    await setup_entity(var, config)
+
+    cg.add(var.traits.set_min_length(min_length))
+    cg.add(var.traits.set_max_length(max_length))
+    if pattern is not None:
+        cg.add(var.traits.set_pattern(pattern))
+
+    cg.add(var.traits.set_mode(config[CONF_MODE]))
+
+    for conf in config.get(CONF_ON_VALUE, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(trigger, [(cg.std_string, "x")], conf)
+
+    if CONF_MQTT_ID in config:
+        mqtt_ = cg.new_Pvariable(config[CONF_MQTT_ID], var)
+        await mqtt.register_mqtt_component(mqtt_, config)
+
+
+async def register_text(
+    var,
+    config,
+    *,
+    min_length: Optional[int] = 0,
+    max_length: Optional[int] = 255,
+    pattern: Optional[str] = None,
+):
+    if not CORE.has_id(config[CONF_ID]):
+        var = cg.Pvariable(config[CONF_ID], var)
+    cg.add(cg.App.register_text(var))
+    await setup_text_core_(
+        var, config, min_length=min_length, max_length=max_length, pattern=pattern
+    )
+
+
+async def new_text(
+    config,
+    *,
+    min_length: Optional[int] = 0,
+    max_length: Optional[int] = 255,
+    pattern: Optional[str] = None,
+):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await register_text(
+        var, config, min_length=min_length, max_length=max_length, pattern=pattern
+    )
+    return var
+
+
+@coroutine_with_priority(40.0)
+async def to_code(config):
+    cg.add_define("USE_TEXT")
+    cg.add_global(text_ns.using)
+
+
+OPERATION_BASE_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ID): cv.use_id(Text),
+    }
+)
+
+
+@automation.register_action(
+    "text.set",
+    TextSetAction,
+    OPERATION_BASE_SCHEMA.extend(
+        {
+            cv.Required(CONF_VALUE): cv.templatable(cv.string_strict),
+        }
+    ),
+)
+async def text_set_to_code(config, action_id, template_arg, args):
+    paren = await cg.get_variable(config[CONF_ID])
+    var = cg.new_Pvariable(action_id, template_arg, paren)
+    template_ = await cg.templatable(config[CONF_VALUE], args, cg.std_string)
+    cg.add(var.set_value(template_))
+    return var
diff --git a/esphome/components/text/automation.h b/esphome/components/text/automation.h
new file mode 100644
index 0000000000..f20a4f433b
--- /dev/null
+++ b/esphome/components/text/automation.h
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+#include "text.h"
+
+namespace esphome {
+namespace text {
+
+class TextStateTrigger : public Trigger<std::string> {
+ public:
+  explicit TextStateTrigger(Text *parent) {
+    parent->add_on_state_callback([this](const std::string &value) { this->trigger(value); });
+  }
+};
+
+template<typename... Ts> class TextSetAction : public Action<Ts...> {
+ public:
+  explicit TextSetAction(Text *text) : text_(text) {}
+  TEMPLATABLE_VALUE(std::string, value)
+
+  void play(Ts... x) override {
+    auto call = this->text_->make_call();
+    call.set_value(this->value_.value(x...));
+    call.perform();
+  }
+
+ protected:
+  Text *text_;
+};
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/text/text.cpp b/esphome/components/text/text.cpp
new file mode 100644
index 0000000000..8f0242e747
--- /dev/null
+++ b/esphome/components/text/text.cpp
@@ -0,0 +1,26 @@
+#include "text.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace text {
+
+static const char *const TAG = "text";
+
+void Text::publish_state(const std::string &state) {
+  this->has_state_ = true;
+  this->state = state;
+  if (this->traits.get_mode() == TEXT_MODE_PASSWORD) {
+    ESP_LOGD(TAG, "'%s': Sending state " LOG_SECRET("'%s'"), this->get_name().c_str(), state.c_str());
+
+  } else {
+    ESP_LOGD(TAG, "'%s': Sending state %s", this->get_name().c_str(), state.c_str());
+  }
+  this->state_callback_.call(state);
+}
+
+void Text::add_on_state_callback(std::function<void(std::string)> &&callback) {
+  this->state_callback_.add(std::move(callback));
+}
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/text/text.h b/esphome/components/text/text.h
new file mode 100644
index 0000000000..f71dde69ba
--- /dev/null
+++ b/esphome/components/text/text.h
@@ -0,0 +1,55 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/entity_base.h"
+#include "esphome/core/helpers.h"
+#include "text_call.h"
+#include "text_traits.h"
+
+namespace esphome {
+namespace text {
+
+#define LOG_TEXT(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()); \
+    } \
+  }
+
+/** Base-class for all text inputs.
+ *
+ * A text input can use publish_state to send out a new value.
+ */
+class Text : public EntityBase {
+ public:
+  std::string state;
+  TextTraits traits;
+
+  void publish_state(const std::string &state);
+
+  /// Return whether this text input has gotten a full state yet.
+  bool has_state() const { return has_state_; }
+
+  /// Instantiate a TextCall object to modify this text component's state.
+  TextCall make_call() { return TextCall(this); }
+
+  void add_on_state_callback(std::function<void(std::string)> &&callback);
+
+ protected:
+  friend class TextCall;
+
+  /** Set the value of the text input, this is a virtual method that each text input integration must implement.
+   *
+   * This method is called by the TextCall.
+   *
+   * @param value The value as validated by the TextCall.
+   */
+  virtual void control(const std::string &value) = 0;
+
+  CallbackManager<void(std::string)> state_callback_;
+  bool has_state_{false};
+};
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/text/text_call.cpp b/esphome/components/text/text_call.cpp
new file mode 100644
index 0000000000..0d0a1d228d
--- /dev/null
+++ b/esphome/components/text/text_call.cpp
@@ -0,0 +1,56 @@
+#include "text_call.h"
+#include "esphome/core/log.h"
+#include "text.h"
+
+namespace esphome {
+namespace text {
+
+static const char *const TAG = "text";
+
+TextCall &TextCall::set_value(const std::string &value) {
+  this->value_ = value;
+  return *this;
+}
+
+void TextCall::validate_() {
+  const auto *name = this->parent_->get_name().c_str();
+
+  if (!this->value_.has_value()) {
+    ESP_LOGW(TAG, "'%s' - No value set for TextCall", name);
+    return;
+  }
+
+  int sz = this->value_.value().size();
+
+  if (sz > this->parent_->traits.get_max_length()) {
+    ESP_LOGW(TAG, "'%s' - Value set for TextCall is too long", name);
+    this->value_.reset();
+    return;
+  }
+
+  if (sz < this->parent_->traits.get_min_length()) {
+    ESP_LOGW(TAG, "'%s' - Value set for TextCall is too short", name);
+    this->value_.reset();
+    return;
+  }
+}
+
+void TextCall::perform() {
+  this->validate_();
+  if (!this->value_.has_value()) {
+    ESP_LOGW(TAG, "'%s' - No value set for TextCall", this->parent_->get_name().c_str());
+    return;
+  }
+  std::string target_value = this->value_.value();
+
+  if (this->parent_->traits.get_mode() == TEXT_MODE_PASSWORD) {
+    ESP_LOGD(TAG, "'%s' - Setting password value: " LOG_SECRET("'%s'"), this->parent_->get_name().c_str(),
+             target_value.c_str());
+  } else {
+    ESP_LOGD(TAG, "'%s' - Setting text value: %s", this->parent_->get_name().c_str(), target_value.c_str());
+  }
+  this->parent_->control(target_value);
+}
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/text/text_call.h b/esphome/components/text/text_call.h
new file mode 100644
index 0000000000..9f75a25c6b
--- /dev/null
+++ b/esphome/components/text/text_call.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "esphome/core/helpers.h"
+#include "text_traits.h"
+
+namespace esphome {
+namespace text {
+
+class Text;
+
+class TextCall {
+ public:
+  explicit TextCall(Text *parent) : parent_(parent) {}
+  void perform();
+
+  TextCall &set_value(const std::string &value);
+
+ protected:
+  Text *const parent_;
+  optional<std::string> value_;
+  void validate_();
+};
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/text/text_traits.h b/esphome/components/text/text_traits.h
new file mode 100644
index 0000000000..952afa70c7
--- /dev/null
+++ b/esphome/components/text/text_traits.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <utility>
+
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace text {
+
+enum TextMode : uint8_t {
+  TEXT_MODE_TEXT = 0,
+  TEXT_MODE_PASSWORD = 1,
+};
+
+class TextTraits {
+ public:
+  // Set/get the number value boundaries.
+  void set_min_length(int min_length) { this->min_length_ = min_length; }
+  int get_min_length() const { return this->min_length_; }
+  void set_max_length(int max_length) { this->max_length_ = max_length; }
+  int get_max_length() const { return this->max_length_; }
+
+  // Set/get the pattern.
+  void set_pattern(std::string pattern) { this->pattern_ = std::move(pattern); }
+  std::string get_pattern() const { return this->pattern_; }
+
+  // Set/get the frontend mode.
+  void set_mode(TextMode mode) { this->mode_ = mode; }
+  TextMode get_mode() const { return this->mode_; }
+
+ protected:
+  int min_length_;
+  int max_length_;
+  std::string pattern_;
+  TextMode mode_{TEXT_MODE_TEXT};
+};
+
+}  // namespace text
+}  // namespace esphome
diff --git a/esphome/components/web_server/list_entities.cpp b/esphome/components/web_server/list_entities.cpp
index 016dd37dd9..5c9009c5da 100644
--- a/esphome/components/web_server/list_entities.cpp
+++ b/esphome/components/web_server/list_entities.cpp
@@ -82,6 +82,13 @@ bool ListEntitiesIterator::on_number(number::Number *number) {
 }
 #endif
 
+#ifdef USE_TEXT
+bool ListEntitiesIterator::on_text(text::Text *text) {
+  this->web_server_->events_.send(this->web_server_->text_json(text, text->state, DETAIL_ALL).c_str(), "state");
+  return true;
+}
+#endif
+
 #ifdef USE_SELECT
 bool ListEntitiesIterator::on_select(select::Select *select) {
   this->web_server_->events_.send(this->web_server_->select_json(select, select->state, DETAIL_ALL).c_str(), "state");
diff --git a/esphome/components/web_server/list_entities.h b/esphome/components/web_server/list_entities.h
index 1569c8ac57..7da5b3fe2c 100644
--- a/esphome/components/web_server/list_entities.h
+++ b/esphome/components/web_server/list_entities.h
@@ -41,6 +41,9 @@ class ListEntitiesIterator : public ComponentIterator {
 #ifdef USE_NUMBER
   bool on_number(number::Number *number) override;
 #endif
+#ifdef USE_TEXT
+  bool on_text(text::Text *text) override;
+#endif
 #ifdef USE_SELECT
   bool on_select(select::Select *select) override;
 #endif
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index dec8fb8e21..ccc86e5e53 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -264,6 +264,32 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
   }
 #endif
 
+#ifdef USE_TEXT
+  for (auto *obj : App.get_texts()) {
+    if (this->include_internal_ || !obj->is_internal()) {
+      write_row(stream, obj, "text", "", [](AsyncResponseStream &stream, EntityBase *obj) {
+        text::Text *text = (text::Text *) obj;
+        auto mode = (int) text->traits.get_mode();
+        stream.print(R"(<input type=")");
+        if (mode == 2) {
+          stream.print(R"(password)");
+        } else {  // default
+          stream.print(R"(text)");
+        }
+        stream.print(R"(" minlength=")");
+        stream.print(text->traits.get_min_length());
+        stream.print(R"(" maxlength=")");
+        stream.print(text->traits.get_max_length());
+        stream.print(R"(" pattern=")");
+        stream.print(text->traits.get_pattern().c_str());
+        stream.print(R"(" value=")");
+        stream.print(text->state.c_str());
+        stream.print(R"("/>)");
+      });
+    }
+  }
+#endif
+
 #ifdef USE_SELECT
   for (auto *obj : App.get_selects()) {
     if (this->include_internal_ || !obj->is_internal()) {
@@ -795,6 +821,57 @@ std::string WebServer::number_json(number::Number *obj, float value, JsonDetail
 }
 #endif
 
+#ifdef USE_TEXT
+void WebServer::on_text_update(text::Text *obj, const std::string &state) {
+  this->events_.send(this->text_json(obj, state, DETAIL_STATE).c_str(), "state");
+}
+void WebServer::handle_text_request(AsyncWebServerRequest *request, const UrlMatch &match) {
+  for (auto *obj : App.get_texts()) {
+    if (obj->get_object_id() != match.id)
+      continue;
+
+    if (request->method() == HTTP_GET) {
+      std::string data = this->text_json(obj, obj->state, DETAIL_STATE);
+      request->send(200, "text/json", data.c_str());
+      return;
+    }
+    if (match.method != "set") {
+      request->send(404);
+      return;
+    }
+
+    auto call = obj->make_call();
+    if (request->hasParam("value")) {
+      String value = request->getParam("value")->value();
+      call.set_value(value.c_str());
+    }
+
+    this->defer([call]() mutable { call.perform(); });
+    request->send(200);
+    return;
+  }
+  request->send(404);
+}
+
+std::string WebServer::text_json(text::Text *obj, const std::string &value, JsonDetail start_config) {
+  return json::build_json([obj, value, start_config](JsonObject root) {
+    set_json_id(root, obj, "text-" + obj->get_object_id(), start_config);
+    if (start_config == DETAIL_ALL) {
+      root["mode"] = (int) obj->traits.get_mode();
+    }
+    root["min_length"] = obj->traits.get_min_length();
+    root["max_length"] = obj->traits.get_max_length();
+    root["pattern"] = obj->traits.get_pattern();
+    if (obj->traits.get_mode() == text::TextMode::TEXT_MODE_PASSWORD) {
+      root["state"] = "********";
+    } else {
+      root["state"] = value;
+    }
+    root["value"] = value;
+  });
+}
+#endif
+
 #ifdef USE_SELECT
 void WebServer::on_select_update(select::Select *obj, const std::string &state, size_t index) {
   this->events_.send(this->select_json(obj, state, DETAIL_STATE).c_str(), "state");
@@ -1116,6 +1193,11 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
     return true;
 #endif
 
+#ifdef USE_TEXT
+  if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "text")
+    return true;
+#endif
+
 #ifdef USE_SELECT
   if ((request->method() == HTTP_POST || request->method() == HTTP_GET) && match.domain == "select")
     return true;
@@ -1222,6 +1304,13 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
   }
 #endif
 
+#ifdef USE_TEXT
+  if (match.domain == "text") {
+    this->handle_text_request(request, match);
+    return;
+  }
+#endif
+
 #ifdef USE_SELECT
   if (match.domain == "select") {
     this->handle_select_request(request, match);
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index 788e30ccf2..45b99d4eba 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -216,6 +216,15 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   std::string number_json(number::Number *obj, float value, JsonDetail start_config);
 #endif
 
+#ifdef USE_TEXT
+  void on_text_update(text::Text *obj, const std::string &state) override;
+  /// Handle a text input request under '/text/<id>'.
+  void handle_text_request(AsyncWebServerRequest *request, const UrlMatch &match);
+
+  /// Dump the text state with its value as a JSON string.
+  std::string text_json(text::Text *obj, const std::string &value, JsonDetail start_config);
+#endif
+
 #ifdef USE_SELECT
   void on_select_update(select::Select *obj, const std::string &state, size_t index) override;
   /// Handle a select request under '/select/<id>'.
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index d699a2647b..1b95370fdf 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -182,6 +182,7 @@ RESERVED_IDS = [
     "struct",
     "switch",
     "template",
+    "text",
     "this",
     "thread_local",
     "throw",
diff --git a/esphome/const.py b/esphome/const.py
index a06c75ae44..9e0bd4da0a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -542,6 +542,7 @@ CONF_PANASONIC = "panasonic"
 CONF_PARAMETERS = "parameters"
 CONF_PASSWORD = "password"
 CONF_PATH = "path"
+CONF_PATTERN = "pattern"
 CONF_PAYLOAD = "payload"
 CONF_PAYLOAD_AVAILABLE = "payload_available"
 CONF_PAYLOAD_NOT_AVAILABLE = "payload_not_available"
@@ -679,6 +680,7 @@ CONF_SERVERS = "servers"
 CONF_SERVICE = "service"
 CONF_SERVICE_UUID = "service_uuid"
 CONF_SERVICES = "services"
+CONF_SET_ACTION = "set_action"
 CONF_SET_POINT_MINIMUM_DIFFERENTIAL = "set_point_minimum_differential"
 CONF_SETUP_MODE = "setup_mode"
 CONF_SETUP_PRIORITY = "setup_priority"
diff --git a/esphome/core/application.h b/esphome/core/application.h
index 054f2ea648..f2dbaa4db5 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -39,6 +39,9 @@
 #ifdef USE_NUMBER
 #include "esphome/components/number/number.h"
 #endif
+#ifdef USE_TEXT
+#include "esphome/components/text/text.h"
+#endif
 #ifdef USE_SELECT
 #include "esphome/components/select/select.h"
 #endif
@@ -117,6 +120,10 @@ class Application {
   void register_number(number::Number *number) { this->numbers_.push_back(number); }
 #endif
 
+#ifdef USE_TEXT
+  void register_text(text::Text *text) { this->texts_.push_back(text); }
+#endif
+
 #ifdef USE_SELECT
   void register_select(select::Select *select) { this->selects_.push_back(select); }
 #endif
@@ -277,6 +284,15 @@ class Application {
     return nullptr;
   }
 #endif
+#ifdef USE_TEXT
+  const std::vector<text::Text *> &get_texts() { return this->texts_; }
+  text::Text *get_text_by_key(uint32_t key, bool include_internal = false) {
+    for (auto *obj : this->texts_)
+      if (obj->get_object_id_hash() == key && (include_internal || !obj->is_internal()))
+        return obj;
+    return nullptr;
+  }
+#endif
 #ifdef USE_SELECT
   const std::vector<select::Select *> &get_selects() { return this->selects_; }
   select::Select *get_select_by_key(uint32_t key, bool include_internal = false) {
@@ -364,6 +380,9 @@ class Application {
 #ifdef USE_SELECT
   std::vector<select::Select *> selects_{};
 #endif
+#ifdef USE_TEXT
+  std::vector<text::Text *> texts_{};
+#endif
 #ifdef USE_LOCK
   std::vector<lock::Lock *> locks_{};
 #endif
diff --git a/esphome/core/component_iterator.cpp b/esphome/core/component_iterator.cpp
index 871f6d6c0e..0bf8fb6f83 100644
--- a/esphome/core/component_iterator.cpp
+++ b/esphome/core/component_iterator.cpp
@@ -202,6 +202,21 @@ void ComponentIterator::advance() {
       }
       break;
 #endif
+#ifdef USE_TEXT
+    case IteratorState::TEXT:
+      if (this->at_ >= App.get_texts().size()) {
+        advance_platform = true;
+      } else {
+        auto *text = App.get_texts()[this->at_];
+        if (text->is_internal() && !this->include_internal_) {
+          success = true;
+          break;
+        } else {
+          success = this->on_text(text);
+        }
+      }
+      break;
+#endif
 #ifdef USE_SELECT
     case IteratorState::SELECT:
       if (this->at_ >= App.get_selects().size()) {
diff --git a/esphome/core/component_iterator.h b/esphome/core/component_iterator.h
index 8b2da6218c..646c39705f 100644
--- a/esphome/core/component_iterator.h
+++ b/esphome/core/component_iterator.h
@@ -57,6 +57,9 @@ class ComponentIterator {
 #ifdef USE_NUMBER
   virtual bool on_number(number::Number *number) = 0;
 #endif
+#ifdef USE_TEXT
+  virtual bool on_text(text::Text *text) = 0;
+#endif
 #ifdef USE_SELECT
   virtual bool on_select(select::Select *select) = 0;
 #endif
@@ -111,6 +114,9 @@ class ComponentIterator {
 #ifdef USE_NUMBER
     NUMBER,
 #endif
+#ifdef USE_TEXT
+    TEXT,
+#endif
 #ifdef USE_SELECT
     SELECT,
 #endif
diff --git a/esphome/core/controller.cpp b/esphome/core/controller.cpp
index 18d427b40c..95f63b6224 100644
--- a/esphome/core/controller.cpp
+++ b/esphome/core/controller.cpp
@@ -59,6 +59,12 @@ void Controller::setup_controller(bool include_internal) {
       obj->add_on_state_callback([this, obj](float state) { this->on_number_update(obj, state); });
   }
 #endif
+#ifdef USE_TEXT
+  for (auto *obj : App.get_texts()) {
+    if (include_internal || !obj->is_internal())
+      obj->add_on_state_callback([this, obj](const std::string &state) { this->on_text_update(obj, state); });
+  }
+#endif
 #ifdef USE_SELECT
   for (auto *obj : App.get_selects()) {
     if (include_internal || !obj->is_internal()) {
diff --git a/esphome/core/controller.h b/esphome/core/controller.h
index 25a4acb36e..f977d8a36a 100644
--- a/esphome/core/controller.h
+++ b/esphome/core/controller.h
@@ -31,6 +31,9 @@
 #ifdef USE_NUMBER
 #include "esphome/components/number/number.h"
 #endif
+#ifdef USE_TEXT
+#include "esphome/components/text/text.h"
+#endif
 #ifdef USE_SELECT
 #include "esphome/components/select/select.h"
 #endif
@@ -76,6 +79,9 @@ class Controller {
 #ifdef USE_NUMBER
   virtual void on_number_update(number::Number *obj, float state){};
 #endif
+#ifdef USE_TEXT
+  virtual void on_text_update(text::Text *obj, const std::string &state){};
+#endif
 #ifdef USE_SELECT
   virtual void on_select_update(select::Select *obj, const std::string &state, size_t index){};
 #endif
diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 71493119c0..598b08063b 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -44,6 +44,7 @@
 #define USE_SENSOR
 #define USE_STATUS_LED
 #define USE_SWITCH
+#define USE_TEXT
 #define USE_TEXT_SENSOR
 #define USE_TIME
 #define USE_TOUCHSCREEN
diff --git a/script/api_protobuf/api_protobuf.py b/script/api_protobuf/api_protobuf.py
index 3c19034e96..b1292095d8 100755
--- a/script/api_protobuf/api_protobuf.py
+++ b/script/api_protobuf/api_protobuf.py
@@ -4,7 +4,7 @@
 It's pretty crappy spaghetti code, but it works.
 
 you need to install protobuf-compiler:
-running protc --version should return
+running protoc --version should return
 libprotoc 3.6.1
 
 then run this script with python3 and the files
diff --git a/script/ci-custom.py b/script/ci-custom.py
index da4da50d7e..d8c2f3053f 100755
--- a/script/ci-custom.py
+++ b/script/ci-custom.py
@@ -617,6 +617,7 @@ def lint_trailing_whitespace(fname, match):
         "esphome/components/lock/lock.h",
         "esphome/components/mqtt/mqtt_component.h",
         "esphome/components/number/number.h",
+        "esphome/components/text/text.h",
         "esphome/components/output/binary_output.h",
         "esphome/components/output/float_output.h",
         "esphome/components/nextion/nextion_base.h",
diff --git a/tests/component_tests/text/test_text.py b/tests/component_tests/text/test_text.py
new file mode 100644
index 0000000000..43f4ef2592
--- /dev/null
+++ b/tests/component_tests/text/test_text.py
@@ -0,0 +1,56 @@
+"""Tests for the binary sensor component."""
+
+
+def test_text_is_setup(generate_main):
+    """
+    When the binary sensor is set in the yaml file, it should be registered in main
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
+
+    # Then
+    assert "new template_::TemplateText();" in main_cpp
+    assert "App.register_text" in main_cpp
+
+
+def test_text_sets_mandatory_fields(generate_main):
+    """
+    When the mandatory fields are set in the yaml, they should be set in main
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
+
+    # Then
+    assert 'it_1->set_name("test 1 text");' in main_cpp
+
+
+def test_text_config_value_internal_set(generate_main):
+    """
+    Test that the "internal" config value is correctly set
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
+
+    # Then
+    assert "it_2->set_internal(false);" in main_cpp
+    assert "it_3->set_internal(true);" in main_cpp
+
+
+def test_text_config_value_mode_set(generate_main):
+    """
+    Test that the "internal" config value is correctly set
+    """
+    # Given
+
+    # When
+    main_cpp = generate_main("tests/component_tests/text/test_text.yaml")
+
+    # Then
+    assert "it_1->traits.set_mode(text::TEXT_MODE_TEXT);" in main_cpp
+    assert "it_3->traits.set_mode(text::TEXT_MODE_PASSWORD);" in main_cpp
diff --git a/tests/component_tests/text/test_text.yaml b/tests/component_tests/text/test_text.yaml
new file mode 100644
index 0000000000..d0fdf5303f
--- /dev/null
+++ b/tests/component_tests/text/test_text.yaml
@@ -0,0 +1,33 @@
+esphome:
+  name: test
+
+esp32:
+  board: esp32dev
+
+text:
+  - platform: template
+    name: "test 1 text"
+    id: "it_1"
+    optimistic: true
+    mode: text
+
+  - platform: template
+    name: "test 2 text"
+    id: "it_2"
+    icon: "mdi:text"
+    optimistic: true
+    min_length: 5
+    max_length: 255
+    internal: false
+    initial_value: "Welcome ESPHOME"
+    restore_value: true
+    mode: text
+
+  - platform: template
+    name: "test 3 key"
+    id: "it_3"
+    icon: "mdi:text"
+    mode: "password"
+    optimistic: true
+    internal: true
+    max_length: 255
diff --git a/tests/test2.yaml b/tests/test2.yaml
index fe1ad91f8d..bfc886eaa4 100644
--- a/tests/test2.yaml
+++ b/tests/test2.yaml
@@ -795,7 +795,23 @@ switch:
           value: !lambda |-
             return {0x13, 0x37};
 
-
 esp32_ble_server:
   id: ble
   manufacturer_data: [0x72, 0x4, 0x00, 0x23]
+
+text:
+  - platform: template
+    name: My Text
+    id: my_text
+    min_length: 0
+    max_length: 20
+    mode: text
+    pattern: "[a-z]+"
+    optimistic: true
+    restore_value: true
+    initial_value: "Hello World"
+  - platform: copy
+    name: My Text Copy
+    id: my_text_copy
+    source_id: my_text
+    mode: password

From ec835c0b0533d9490d46d68ad565bbed5d4f3ef7 Mon Sep 17 00:00:00 2001
From: dentra <dentra@users.noreply.github.com>
Date: Wed, 25 Oct 2023 21:15:25 +0300
Subject: [PATCH 058/131] Fix exception handling when loading packages (#5569)

---
 esphome/components/packages/__init__.py | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 98483e8ae9..56a59c54d1 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -139,17 +139,22 @@ def _process_base_package(config: dict) -> dict:
                 ) from e
         return packages
 
-    packages = {}
+    packages = None
+    error = ""
 
     try:
         packages = get_packages(files)
-    except cv.Invalid:
-        if revert is not None:
-            revert()
-            packages = get_packages(files)
-    finally:
-        if packages is None:
-            raise cv.Invalid("Failed to load packages")
+    except cv.Invalid as e:
+        error = e
+        try:
+            if revert is not None:
+                revert()
+                packages = get_packages(files)
+        except cv.Invalid as er:
+            error = er
+
+    if packages is None:
+        raise cv.Invalid(f"Failed to load packages. {error}")
 
     return {"packages": packages}
 

From 2895cc6c57a55c93cbf086e1063f7803153b5e2b Mon Sep 17 00:00:00 2001
From: jpfaff <jonas.pfaff@gmail.com>
Date: Wed, 25 Oct 2023 20:28:07 +0200
Subject: [PATCH 059/131] Add support for honeywellabp2 pressure sensor (#5422)

---
 CODEOWNERS                                    |   1 +
 .../components/honeywellabp2_i2c/__init__.py  |   2 +
 .../honeywellabp2_i2c/honeywellabp2.cpp       | 108 ++++++++++++++++++
 .../honeywellabp2_i2c/honeywellabp2.h         |  60 ++++++++++
 .../components/honeywellabp2_i2c/sensor.py    |  75 ++++++++++++
 tests/test1.yaml                              |  10 ++
 6 files changed, 256 insertions(+)
 create mode 100644 esphome/components/honeywellabp2_i2c/__init__.py
 create mode 100644 esphome/components/honeywellabp2_i2c/honeywellabp2.cpp
 create mode 100644 esphome/components/honeywellabp2_i2c/honeywellabp2.h
 create mode 100644 esphome/components/honeywellabp2_i2c/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index eff8f28a53..ad44d52639 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -122,6 +122,7 @@ esphome/components/hitachi_ac424/* @sourabhjaiswal
 esphome/components/hm3301/* @freekode
 esphome/components/homeassistant/* @OttoWinter
 esphome/components/honeywellabp/* @RubyBailey
+esphome/components/honeywellabp2_i2c/* @jpfaff
 esphome/components/host/* @esphome/core
 esphome/components/hrxl_maxsonar_wr/* @netmikey
 esphome/components/hte501/* @Stock-M
diff --git a/esphome/components/honeywellabp2_i2c/__init__.py b/esphome/components/honeywellabp2_i2c/__init__.py
new file mode 100644
index 0000000000..e748df3c98
--- /dev/null
+++ b/esphome/components/honeywellabp2_i2c/__init__.py
@@ -0,0 +1,2 @@
+"""Support for Honeywell ABP2"""
+CODEOWNERS = ["@jpfaff"]
diff --git a/esphome/components/honeywellabp2_i2c/honeywellabp2.cpp b/esphome/components/honeywellabp2_i2c/honeywellabp2.cpp
new file mode 100644
index 0000000000..e2910032cc
--- /dev/null
+++ b/esphome/components/honeywellabp2_i2c/honeywellabp2.cpp
@@ -0,0 +1,108 @@
+#include "honeywellabp2.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace honeywellabp2_i2c {
+
+static const uint8_t STATUS_BIT_POWER = 6;
+static const uint8_t STATUS_BIT_BUSY = 5;
+static const uint8_t STATUS_BIT_ERROR = 2;
+static const uint8_t STATUS_MATH_SAT = 0;
+
+static const char *const TAG = "honeywellabp2";
+
+void HONEYWELLABP2Sensor::read_sensor_data() {
+  if (this->read(raw_data_, 7) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    this->mark_failed();
+    return;
+  }
+  float press_counts = encode_uint24(raw_data_[1], raw_data_[2], raw_data_[3]);  // calculate digital pressure counts
+  float temp_counts = encode_uint24(raw_data_[4], raw_data_[5], raw_data_[6]);   // calculate digital temperature counts
+
+  this->last_pressure_ = (((press_counts - this->min_count_) / (this->max_count_ - this->min_count_)) *
+                          (this->max_pressure_ - this->min_pressure_)) +
+                         this->min_pressure_;
+  this->last_temperature_ = (temp_counts * 200 / 16777215) - 50;
+}
+
+void HONEYWELLABP2Sensor::start_measurement() {
+  if (this->write(i2c_cmd_, 3) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    this->mark_failed();
+    return;
+  }
+  this->measurement_running_ = true;
+}
+
+bool HONEYWELLABP2Sensor::is_measurement_ready() {
+  if (this->read(raw_data_, 1) != i2c::ERROR_OK) {
+    ESP_LOGE(TAG, "Communication with ABP2 failed!");
+    this->mark_failed();
+    return false;
+  }
+  if ((raw_data_[0] & (0x1 << STATUS_BIT_BUSY)) > 0) {
+    return false;
+  }
+  this->measurement_running_ = false;
+  return true;
+}
+
+void HONEYWELLABP2Sensor::measurement_timeout() {
+  ESP_LOGE(TAG, "Timeout!");
+  this->measurement_running_ = false;
+  this->mark_failed();
+}
+
+float HONEYWELLABP2Sensor::get_pressure() { return this->last_pressure_; }
+
+float HONEYWELLABP2Sensor::get_temperature() { return this->last_temperature_; }
+
+void HONEYWELLABP2Sensor::loop() {
+  if (this->measurement_running_) {
+    if (this->is_measurement_ready()) {
+      this->cancel_timeout("meas_timeout");
+
+      this->read_sensor_data();
+      if (pressure_sensor_ != nullptr) {
+        this->pressure_sensor_->publish_state(this->get_pressure());
+      }
+      if (temperature_sensor_ != nullptr) {
+        this->temperature_sensor_->publish_state(this->get_temperature());
+      }
+    }
+  }
+}
+
+void HONEYWELLABP2Sensor::update() {
+  ESP_LOGV(TAG, "Update Honeywell ABP2 Sensor");
+
+  this->start_measurement();
+  this->set_timeout("meas_timeout", 50, [this] { this->measurement_timeout(); });
+}
+
+void HONEYWELLABP2Sensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "  Min Pressure Range: %0.1f", this->min_pressure_);
+  ESP_LOGCONFIG(TAG, "  Max Pressure Range: %0.1f", this->max_pressure_);
+  if (this->transfer_function_ == ABP2_TRANS_FUNC_A) {
+    ESP_LOGCONFIG(TAG, "  Transfer function A");
+  } else {
+    ESP_LOGCONFIG(TAG, "  Transfer function B");
+  }
+  LOG_UPDATE_INTERVAL(this);
+}
+
+void HONEYWELLABP2Sensor::set_transfer_function(ABP2TRANFERFUNCTION transfer_function) {
+  this->transfer_function_ = transfer_function;
+  if (this->transfer_function_ == ABP2_TRANS_FUNC_B) {
+    this->max_count_ = this->max_count_b_;
+    this->min_count_ = this->min_count_b_;
+  } else {
+    this->max_count_ = this->max_count_a_;
+    this->min_count_ = this->min_count_a_;
+  }
+}
+
+}  // namespace honeywellabp2_i2c
+}  // namespace esphome
diff --git a/esphome/components/honeywellabp2_i2c/honeywellabp2.h b/esphome/components/honeywellabp2_i2c/honeywellabp2.h
new file mode 100644
index 0000000000..bc81524ac2
--- /dev/null
+++ b/esphome/components/honeywellabp2_i2c/honeywellabp2.h
@@ -0,0 +1,60 @@
+// for Honeywell ABP sensor
+// adapting code from https://github.com/vwls/Honeywell_pressure_sensors
+#pragma once
+
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace honeywellabp2_i2c {
+
+enum ABP2TRANFERFUNCTION { ABP2_TRANS_FUNC_A = 0, ABP2_TRANS_FUNC_B = 1 };
+
+class HONEYWELLABP2Sensor : public PollingComponent, public i2c::I2CDevice {
+ public:
+  void set_pressure_sensor(sensor::Sensor *pressure_sensor) { this->pressure_sensor_ = pressure_sensor; };
+  void set_temperature_sensor(sensor::Sensor *temperature_sensor) { this->temperature_sensor_ = temperature_sensor; };
+  void loop() override;
+  void update() override;
+  float get_setup_priority() const override { return setup_priority::DATA; };
+  void dump_config() override;
+
+  void read_sensor_data();
+  void start_measurement();
+  bool is_measurement_ready();
+  void measurement_timeout();
+
+  float get_pressure();
+  float get_temperature();
+
+  void set_min_pressure(float min_pressure) { this->min_pressure_ = min_pressure; };
+  void set_max_pressure(float max_pressure) { this->max_pressure_ = max_pressure; };
+  void set_transfer_function(ABP2TRANFERFUNCTION transfer_function);
+
+ protected:
+  float min_pressure_ = 0.0;
+  float max_pressure_ = 0.0;
+  ABP2TRANFERFUNCTION transfer_function_ = ABP2_TRANS_FUNC_A;
+
+  sensor::Sensor *pressure_sensor_{nullptr};
+  sensor::Sensor *temperature_sensor_{nullptr};
+
+  const float max_count_a_ = 15099494.4;  // (90% of 2^24 counts or 0xE66666)
+  const float min_count_a_ = 1677721.6;   // (10% of 2^24 counts or 0x19999A)
+  const float max_count_b_ = 11744051.2;  // (70% of 2^24 counts or 0xB33333)
+  const float min_count_b_ = 5033164.8;   // (30% of 2^24 counts or 0x4CCCCC)
+
+  float max_count_;
+  float min_count_;
+  bool measurement_running_ = false;
+
+  uint8_t raw_data_[7];                      // holds output data
+  uint8_t i2c_cmd_[3] = {0xAA, 0x00, 0x00};  // command to be sent
+  float last_pressure_;
+  float last_temperature_;
+};
+
+}  // namespace honeywellabp2_i2c
+}  // namespace esphome
diff --git a/esphome/components/honeywellabp2_i2c/sensor.py b/esphome/components/honeywellabp2_i2c/sensor.py
new file mode 100644
index 0000000000..c38a380127
--- /dev/null
+++ b/esphome/components/honeywellabp2_i2c/sensor.py
@@ -0,0 +1,75 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.components import i2c
+from esphome.const import (
+    CONF_ID,
+    CONF_PRESSURE,
+    CONF_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+)
+
+DEPENDENCIES = ["i2c"]
+
+honeywellabp2_ns = cg.esphome_ns.namespace("honeywellabp2_i2c")
+
+CONF_MIN_PRESSURE = "min_pressure"
+CONF_MAX_PRESSURE = "max_pressure"
+TRANSFER_FUNCTION = "transfer_function"
+ABP2TRANFERFUNCTION = honeywellabp2_ns.enum("ABP2TRANFERFUNCTION")
+TRANS_FUNC_OPTIONS = {
+    "A": ABP2TRANFERFUNCTION.ABP2_TRANS_FUNC_A,
+    "B": ABP2TRANFERFUNCTION.ABP2_TRANS_FUNC_B,
+}
+
+HONEYWELLABP2Sensor = honeywellabp2_ns.class_(
+    "HONEYWELLABP2Sensor", sensor.Sensor, cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(HONEYWELLABP2Sensor),
+            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement="Pa",
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ).extend(
+                {
+                    cv.Required(CONF_MIN_PRESSURE): cv.float_,
+                    cv.Required(CONF_MAX_PRESSURE): cv.float_,
+                    cv.Required(TRANSFER_FUNCTION): cv.enum(TRANS_FUNC_OPTIONS),
+                }
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x28))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if pressure_config := config.get(CONF_PRESSURE):
+        sens = await sensor.new_sensor(pressure_config)
+        cg.add(var.set_pressure_sensor(sens))
+        cg.add(var.set_min_pressure(pressure_config[CONF_MIN_PRESSURE]))
+        cg.add(var.set_max_pressure(pressure_config[CONF_MAX_PRESSURE]))
+        cg.add(var.set_transfer_function(pressure_config[TRANSFER_FUNCTION]))
+
+    if temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
diff --git a/tests/test1.yaml b/tests/test1.yaml
index a8421152ed..0edc0bbaa7 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -742,6 +742,16 @@ sensor:
     temperature:
       name: Honeywell temperature
     cs_pin: GPIO5
+  - platform: honeywellabp2_i2c
+    pressure:
+      name: Honeywell2 pressure
+      min_pressure: 0
+      max_pressure: 16000
+      transfer_function: A
+    temperature:
+      name: Honeywell temperature
+    i2c_id: i2c_bus
+    address: 0x28
   - platform: hte501
     temperature:
       name: Office Temperature 2

From 28aedae8d72613fc9d712af323a3c503bcf62d3d Mon Sep 17 00:00:00 2001
From: Eduard Llull <ellull@users.noreply.github.com>
Date: Wed, 25 Oct 2023 20:30:11 +0200
Subject: [PATCH 060/131] Add Emc2101 (#4491)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/emc2101/__init__.py        |  81 +++++++++
 esphome/components/emc2101/emc2101.cpp        | 169 ++++++++++++++++++
 esphome/components/emc2101/emc2101.h          | 115 ++++++++++++
 esphome/components/emc2101/output/__init__.py |  21 +++
 .../emc2101/output/emc2101_output.cpp         |   9 +
 .../emc2101/output/emc2101_output.h           |  22 +++
 esphome/components/emc2101/sensor/__init__.py |  74 ++++++++
 .../emc2101/sensor/emc2101_sensor.cpp         |  43 +++++
 .../emc2101/sensor/emc2101_sensor.h           |  39 ++++
 10 files changed, 574 insertions(+)
 create mode 100644 esphome/components/emc2101/__init__.py
 create mode 100644 esphome/components/emc2101/emc2101.cpp
 create mode 100644 esphome/components/emc2101/emc2101.h
 create mode 100644 esphome/components/emc2101/output/__init__.py
 create mode 100644 esphome/components/emc2101/output/emc2101_output.cpp
 create mode 100644 esphome/components/emc2101/output/emc2101_output.h
 create mode 100644 esphome/components/emc2101/sensor/__init__.py
 create mode 100644 esphome/components/emc2101/sensor/emc2101_sensor.cpp
 create mode 100644 esphome/components/emc2101/sensor/emc2101_sensor.h

diff --git a/CODEOWNERS b/CODEOWNERS
index ad44d52639..b2c0d013be 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -85,6 +85,7 @@ esphome/components/dsmr/* @glmnet @zuidwijk
 esphome/components/duty_time/* @dudanov
 esphome/components/ee895/* @Stock-M
 esphome/components/ektf2232/* @jesserockz
+esphome/components/emc2101/* @ellull
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
 esphome/components/esp32_ble/* @jesserockz
diff --git a/esphome/components/emc2101/__init__.py b/esphome/components/emc2101/__init__.py
new file mode 100644
index 0000000000..7a7b31cf14
--- /dev/null
+++ b/esphome/components/emc2101/__init__.py
@@ -0,0 +1,81 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c
+from esphome.const import CONF_ID, CONF_INVERTED, CONF_RESOLUTION
+
+CODEOWNERS = ["@ellull"]
+
+DEPENDENCIES = ["i2c"]
+
+CONF_PWM = "pwm"
+CONF_DIVIDER = "divider"
+CONF_DAC = "dac"
+CONF_CONVERSION_RATE = "conversion_rate"
+
+CONF_EMC2101_ID = "emc2101_id"
+
+emc2101_ns = cg.esphome_ns.namespace("emc2101")
+
+Emc2101DACConversionRate = emc2101_ns.enum("Emc2101DACConversionRate")
+CONVERSIONS_PER_SECOND = {
+    "1/16": Emc2101DACConversionRate.Emc2101_DAC_1_EVERY_16S,
+    "1/8": Emc2101DACConversionRate.Emc2101_DAC_1_EVERY_8S,
+    "1/4": Emc2101DACConversionRate.Emc2101_DAC_1_EVERY_4S,
+    "1/2": Emc2101DACConversionRate.Emc2101_DAC_1_EVERY_2S,
+    "1": Emc2101DACConversionRate.Emc2101_DAC_1_EVERY_SECOND,
+    "2": Emc2101DACConversionRate.Emc2101_DAC_2_EVERY_SECOND,
+    "4": Emc2101DACConversionRate.Emc2101_DAC_4_EVERY_SECOND,
+    "8": Emc2101DACConversionRate.Emc2101_DAC_8_EVERY_SECOND,
+    "16": Emc2101DACConversionRate.Emc2101_DAC_16_EVERY_SECOND,
+    "32": Emc2101DACConversionRate.Emc2101_DAC_32_EVERY_SECOND,
+}
+
+Emc2101Component = emc2101_ns.class_("Emc2101Component", cg.Component, i2c.I2CDevice)
+
+EMC2101_COMPONENT_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_EMC2101_ID): cv.use_id(Emc2101Component),
+    }
+)
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(Emc2101Component),
+            cv.Optional(CONF_PWM): cv.Schema(
+                {
+                    cv.Optional(CONF_RESOLUTION, default=23): cv.int_range(
+                        min=0, max=31
+                    ),
+                    cv.Optional(CONF_DIVIDER, default=1): cv.uint8_t,
+                }
+            ),
+            cv.Optional(CONF_DAC): cv.Schema(
+                {
+                    cv.Optional(CONF_CONVERSION_RATE, default="16"): cv.enum(
+                        CONVERSIONS_PER_SECOND
+                    ),
+                }
+            ),
+            cv.Optional(CONF_INVERTED, default=False): cv.boolean,
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(i2c.i2c_device_schema(0x4C)),
+    cv.has_exactly_one_key(CONF_PWM, CONF_DAC),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if pwm_config := config.get(CONF_PWM):
+        cg.add(var.set_dac_mode(False))
+        cg.add(var.set_pwm_resolution(pwm_config[CONF_RESOLUTION]))
+        cg.add(var.set_pwm_divider(pwm_config[CONF_DIVIDER]))
+    if dac_config := config.get(CONF_DAC):
+        cg.add(var.set_dac_mode(True))
+        cg.add(var.set_dac_conversion_rate(dac_config[CONF_CONVERSION_RATE]))
+    cg.add(var.set_inverted(config[CONF_INVERTED]))
diff --git a/esphome/components/emc2101/emc2101.cpp b/esphome/components/emc2101/emc2101.cpp
new file mode 100644
index 0000000000..2f45b2e27a
--- /dev/null
+++ b/esphome/components/emc2101/emc2101.cpp
@@ -0,0 +1,169 @@
+// Implementation based on:
+//  - Adafruit_EMC2101: https://github.com/adafruit/Adafruit_EMC2101
+//  - Official Datasheet: https://ww1.microchip.com/downloads/en/DeviceDoc/2101.pdf
+
+#include "esphome/core/log.h"
+#include "emc2101.h"
+
+namespace esphome {
+namespace emc2101 {
+
+static const char *const TAG = "EMC2101";
+
+static const uint8_t EMC2101_CHIP_ID = 0x16;      // EMC2101 default device id from part id
+static const uint8_t EMC2101_ALT_CHIP_ID = 0x28;  // EMC2101 alternate device id from part id
+
+// EMC2101 registers from the datasheet. We only define what we use.
+static const uint8_t EMC2101_REGISTER_INTERNAL_TEMP = 0x00;      // The internal temperature register
+static const uint8_t EMC2101_REGISTER_EXTERNAL_TEMP_MSB = 0x01;  // high byte for the external temperature reading
+static const uint8_t EMC2101_REGISTER_DAC_CONV_RATE = 0x04;      // DAC convesion rate config
+static const uint8_t EMC2101_REGISTER_EXTERNAL_TEMP_LSB = 0x10;  // low byte for the external temperature reading
+static const uint8_t EMC2101_REGISTER_CONFIG = 0x03;             // configuration register
+static const uint8_t EMC2101_REGISTER_TACH_LSB = 0x46;           // Tach RPM data low byte
+static const uint8_t EMC2101_REGISTER_TACH_MSB = 0x47;           // Tach RPM data high byte
+static const uint8_t EMC2101_REGISTER_FAN_CONFIG = 0x4A;         // General fan config register
+static const uint8_t EMC2101_REGISTER_FAN_SETTING = 0x4C;        // Fan speed for non-LUT settings
+static const uint8_t EMC2101_REGISTER_PWM_FREQ = 0x4D;           // PWM frequency setting
+static const uint8_t EMC2101_REGISTER_PWM_DIV = 0x4E;            // PWM frequency divisor
+static const uint8_t EMC2101_REGISTER_WHOAMI = 0xFD;             // Chip ID register
+
+// EMC2101 configuration bits from the datasheet. We only define what we use.
+
+// Determines the funcionallity of the ALERT/TACH pin.
+// 0 (default): The ALERT/TECH pin will function as an open drain, active low interrupt.
+// 1: The ALERT/TECH pin will function as a high impedance TACH input. This may require an
+// external pull-up resistor to set the proper signaling levels.
+static const uint8_t EMC2101_ALT_TCH_BIT = 1 << 2;
+
+// Determines the FAN output mode.
+// 0 (default): PWM output enabled at FAN pin.
+// 1: DAC output enabled at FAN ping.
+static const uint8_t EMC2101_DAC_BIT = 1 << 4;
+
+// Overrides the CLK_SEL bit and uses the Frequency Divide Register to determine
+// the base PWM frequency. It is recommended that this bit be set for maximum PWM resolution.
+// 0 (default): The base clock frequency for the PWM is determined by the CLK_SEL bit.
+// 1 (recommended): The base clock that is used to determine the PWM frequency is set by the
+// Frequency Divide Register
+static const uint8_t EMC2101_CLK_OVR_BIT = 1 << 2;
+
+// Sets the polarity of the Fan output driver.
+// 0 (default): The polarity of the Fan output driver is non-inverted. A '00h' setting will
+// correspond to a 0% duty cycle or a minimum DAC output voltage.
+// 1: The polarity of the Fan output driver is inverted. A '00h' setting will correspond to a
+// 100% duty cycle or a maximum DAC output voltage.
+static const uint8_t EMC2101_POLARITY_BIT = 1 << 4;
+
+float Emc2101Component::get_setup_priority() const { return setup_priority::HARDWARE; }
+
+void Emc2101Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up Emc2101 sensor...");
+
+  // make sure we're talking to the right chip
+  uint8_t chip_id = reg(EMC2101_REGISTER_WHOAMI).get();
+  if ((chip_id != EMC2101_CHIP_ID) && (chip_id != EMC2101_ALT_CHIP_ID)) {
+    ESP_LOGE(TAG, "Wrong chip ID %02X", chip_id);
+    this->mark_failed();
+    return;
+  }
+
+  // Configure EMC2101
+  i2c::I2CRegister config = reg(EMC2101_REGISTER_CONFIG);
+  config |= EMC2101_ALT_TCH_BIT;
+  if (this->dac_mode_) {
+    config |= EMC2101_DAC_BIT;
+  }
+  if (this->inverted_) {
+    config |= EMC2101_POLARITY_BIT;
+  }
+
+  if (this->dac_mode_) {  // DAC mode configurations
+    // set DAC conversion rate
+    reg(EMC2101_REGISTER_DAC_CONV_RATE) = this->dac_conversion_rate_;
+  } else {  // PWM mode configurations
+    // set PWM divider
+    reg(EMC2101_REGISTER_FAN_CONFIG) |= EMC2101_CLK_OVR_BIT;
+    reg(EMC2101_REGISTER_PWM_DIV) = this->pwm_divider_;
+
+    // set PWM resolution
+    reg(EMC2101_REGISTER_PWM_FREQ) = this->pwm_resolution_;
+  }
+}
+
+void Emc2101Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "Emc2101 component:");
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+  }
+  ESP_LOGCONFIG(TAG, "  Mode: %s", this->dac_mode_ ? "DAC" : "PWM");
+  if (this->dac_mode_) {
+    ESP_LOGCONFIG(TAG, "  DAC Conversion Rate: %X", this->dac_conversion_rate_);
+  } else {
+    ESP_LOGCONFIG(TAG, "  PWM Resolution: %02X", this->pwm_resolution_);
+    ESP_LOGCONFIG(TAG, "  PWM Divider: %02X", this->pwm_divider_);
+  }
+  ESP_LOGCONFIG(TAG, "  Inverted: %s", YESNO(this->inverted_));
+}
+
+void Emc2101Component::set_duty_cycle(float value) {
+  uint8_t duty_cycle = remap(value, 0.0f, 1.0f, (uint8_t) 0, this->max_output_value_);
+  ESP_LOGD(TAG, "Setting duty fan setting to %02X", duty_cycle);
+  if (!this->write_byte(EMC2101_REGISTER_FAN_SETTING, duty_cycle)) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    this->status_set_warning();
+    return;
+  }
+}
+
+float Emc2101Component::get_duty_cycle() {
+  uint8_t duty_cycle;
+  if (!this->read_byte(EMC2101_REGISTER_FAN_SETTING, &duty_cycle)) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    this->status_set_warning();
+    return NAN;
+  }
+  return remap(duty_cycle, (uint8_t) 0, this->max_output_value_, 0.0f, 1.0f);
+}
+
+float Emc2101Component::get_internal_temperature() {
+  uint8_t temperature;
+  if (!this->read_byte(EMC2101_REGISTER_INTERNAL_TEMP, &temperature)) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    this->status_set_warning();
+    return NAN;
+  }
+  return temperature;
+}
+
+float Emc2101Component::get_external_temperature() {
+  // Read **MSB** first to match 'Data Read Interlock' behavior from 6.1 of datasheet
+  uint8_t lsb, msb;
+  if (!this->read_byte(EMC2101_REGISTER_EXTERNAL_TEMP_MSB, &msb) ||
+      !this->read_byte(EMC2101_REGISTER_EXTERNAL_TEMP_LSB, &lsb)) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    this->status_set_warning();
+    return NAN;
+  }
+
+  // join msb and lsb (5 least significant bits are not used)
+  uint16_t raw = (msb << 8 | lsb) >> 5;
+  return raw * 0.125;
+}
+
+float Emc2101Component::get_speed() {
+  // Read **LSB** first to match 'Data Read Interlock' behavior from 6.1 of datasheet
+  uint8_t lsb, msb;
+  if (!this->read_byte(EMC2101_REGISTER_TACH_LSB, &lsb) || !this->read_byte(EMC2101_REGISTER_TACH_MSB, &msb)) {
+    ESP_LOGE(TAG, "Communication with EMC2101 failed!");
+    this->status_set_warning();
+    return NAN;
+  }
+
+  // calculate RPMs
+  uint16_t tach = msb << 8 | lsb;
+  return tach == 0xFFFF ? 0.0f : 5400000.0f / tach;
+}
+
+}  // namespace emc2101
+}  // namespace esphome
diff --git a/esphome/components/emc2101/emc2101.h b/esphome/components/emc2101/emc2101.h
new file mode 100644
index 0000000000..0f4bc560dd
--- /dev/null
+++ b/esphome/components/emc2101/emc2101.h
@@ -0,0 +1,115 @@
+#pragma once
+
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace emc2101 {
+
+/** Enum listing all DAC conversion rates for the EMC2101.
+ *
+ * Specific values of the enum constants are register values taken from the EMC2101 datasheet.
+ */
+enum Emc2101DACConversionRate {
+  EMC2101_DAC_1_EVERY_16_S,
+  EMC2101_DAC_1_EVERY_8_S,
+  EMC2101_DAC_1_EVERY_4_S,
+  EMC2101_DAC_1_EVERY_2_S,
+  EMC2101_DAC_1_EVERY_SECOND,
+  EMC2101_DAC_2_EVERY_SECOND,
+  EMC2101_DAC_4_EVERY_SECOND,
+  EMC2101_DAC_8_EVERY_SECOND,
+  EMC2101_DAC_16_EVERY_SECOND,
+  EMC2101_DAC_32_EVERY_SECOND,
+};
+
+/// This class includes support for the EMC2101 i2c fan controller.
+/// The device has an output (PWM or DAC) and several sensors and this
+/// class is for the EMC2101 configuration.
+class Emc2101Component : public Component, public i2c::I2CDevice {
+ public:
+  /** Sets the mode of the output.
+   *
+   * @param dac_mode false for PWM output and true for DAC mode.
+   */
+  void set_dac_mode(bool dac_mode) {
+    this->dac_mode_ = dac_mode;
+    this->max_output_value_ = 63;
+  }
+
+  /** Sets the PWM resolution.
+   *
+   * @param resolution the PWM resolution.
+   */
+  void set_pwm_resolution(uint8_t resolution) {
+    this->pwm_resolution_ = resolution;
+    this->max_output_value_ = 2 * resolution;
+  }
+
+  /** Sets the PWM divider used to derive the PWM frequency.
+   *
+   * @param divider The PWM divider.
+   */
+  void set_pwm_divider(uint8_t divider) { this->pwm_divider_ = divider; }
+
+  /** Sets the DAC conversion rate (how many conversions per second).
+   *
+   * @param conversion_rate The DAC conversion rate.
+   */
+  void set_dac_conversion_rate(Emc2101DACConversionRate conversion_rate) {
+    this->dac_conversion_rate_ = conversion_rate;
+  }
+
+  /** Inverts the polarity of the Fan output.
+   *
+   * @param inverted Invert or not the Fan output.
+   */
+  void set_inverted(bool inverted) { this->inverted_ = inverted; }
+
+  /** Sets the Fan output duty cycle
+   *
+   * @param value The duty cycle value, from 0.0f to 1.0f.
+   */
+  void set_duty_cycle(float value);
+
+  /** Gets the Fan output duty cycle
+   *
+   * @return The duty cycle percentage from 0.0f to 1.0f.
+   */
+  float get_duty_cycle();
+
+  /** Gets the internal temperature sensor reading.
+   *
+   * @return The temperature in degrees celsius.
+   */
+  float get_internal_temperature();
+
+  /** Gets the external temperature sensor reading.
+   *
+   * @return The temperature in degrees celsius.
+   */
+  float get_external_temperature();
+
+  /** Gets the tachometer speed sensor reading.
+   *
+   * @return The fan speed in RPMs.
+   */
+  float get_speed();
+
+  /** Used by ESPHome framework. */
+  void setup() override;
+  /** Used by ESPHome framework. */
+  void dump_config() override;
+  /** Used by ESPHome framework. */
+  float get_setup_priority() const override;
+
+  bool dac_mode_{false};
+  bool inverted_{false};
+  uint8_t max_output_value_;
+  uint8_t pwm_resolution_;
+  uint8_t pwm_divider_;
+  Emc2101DACConversionRate dac_conversion_rate_;
+};
+
+}  // namespace emc2101
+}  // namespace esphome
diff --git a/esphome/components/emc2101/output/__init__.py b/esphome/components/emc2101/output/__init__.py
new file mode 100644
index 0000000000..461ef73de1
--- /dev/null
+++ b/esphome/components/emc2101/output/__init__.py
@@ -0,0 +1,21 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import output
+from esphome.const import CONF_ID
+from .. import EMC2101_COMPONENT_SCHEMA, CONF_EMC2101_ID, emc2101_ns
+
+DEPENDENCIES = ["emc2101"]
+
+EMC2101Output = emc2101_ns.class_("EMC2101Output", output.FloatOutput)
+
+CONFIG_SCHEMA = EMC2101_COMPONENT_SCHEMA.extend(
+    {
+        cv.Required(CONF_ID): cv.declare_id(EMC2101Output),
+    }
+)
+
+
+async def to_code(config):
+    paren = await cg.get_variable(config[CONF_EMC2101_ID])
+    var = cg.new_Pvariable(config[CONF_ID], paren)
+    await output.register_output(var, config)
diff --git a/esphome/components/emc2101/output/emc2101_output.cpp b/esphome/components/emc2101/output/emc2101_output.cpp
new file mode 100644
index 0000000000..2ed506cd99
--- /dev/null
+++ b/esphome/components/emc2101/output/emc2101_output.cpp
@@ -0,0 +1,9 @@
+#include "emc2101_output.h"
+
+namespace esphome {
+namespace emc2101 {
+
+void EMC2101Output::write_state(float state) { this->parent_->set_duty_cycle(state); }
+
+}  // namespace emc2101
+}  // namespace esphome
diff --git a/esphome/components/emc2101/output/emc2101_output.h b/esphome/components/emc2101/output/emc2101_output.h
new file mode 100644
index 0000000000..232df6ff5f
--- /dev/null
+++ b/esphome/components/emc2101/output/emc2101_output.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "../emc2101.h"
+#include "esphome/components/output/float_output.h"
+
+namespace esphome {
+namespace emc2101 {
+
+/// This class allows to control the EMC2101 output.
+class EMC2101Output : public output::FloatOutput {
+ public:
+  EMC2101Output(Emc2101Component *parent) : parent_(parent) {}
+
+ protected:
+  /** Used by ESPHome framework. */
+  void write_state(float state) override;
+
+  Emc2101Component *parent_;
+};
+
+}  // namespace emc2101
+}  // namespace esphome
diff --git a/esphome/components/emc2101/sensor/__init__.py b/esphome/components/emc2101/sensor/__init__.py
new file mode 100644
index 0000000000..03d3d0314e
--- /dev/null
+++ b/esphome/components/emc2101/sensor/__init__.py
@@ -0,0 +1,74 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    CONF_ID,
+    CONF_SPEED,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_PERCENT,
+    UNIT_REVOLUTIONS_PER_MINUTE,
+    ICON_PERCENT,
+)
+from .. import EMC2101_COMPONENT_SCHEMA, CONF_EMC2101_ID, emc2101_ns
+
+DEPENDENCIES = ["emc2101"]
+
+CONF_INTERNAL_TEMPERATURE = "internal_temperature"
+CONF_EXTERNAL_TEMPERATURE = "external_temperature"
+CONF_DUTY_CYCLE = "duty_cycle"
+
+EMC2101Sensor = emc2101_ns.class_("EMC2101Sensor", cg.PollingComponent)
+
+CONFIG_SCHEMA = EMC2101_COMPONENT_SCHEMA.extend(
+    {
+        cv.GenerateID(): cv.declare_id(EMC2101Sensor),
+        cv.Optional(CONF_INTERNAL_TEMPERATURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_CELSIUS,
+            accuracy_decimals=0,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_EXTERNAL_TEMPERATURE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_CELSIUS,
+            accuracy_decimals=3,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_SPEED): sensor.sensor_schema(
+            unit_of_measurement=UNIT_REVOLUTIONS_PER_MINUTE,
+            accuracy_decimals=2,
+            state_class=STATE_CLASS_MEASUREMENT,
+            icon="mdi:fan",
+        ),
+        cv.Optional(CONF_DUTY_CYCLE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            accuracy_decimals=2,
+            state_class=STATE_CLASS_MEASUREMENT,
+            icon=ICON_PERCENT,
+        ),
+    }
+).extend(cv.polling_component_schema("60s"))
+
+
+async def to_code(config):
+    paren = await cg.get_variable(config[CONF_EMC2101_ID])
+    var = cg.new_Pvariable(config[CONF_ID], paren)
+    await cg.register_component(var, config)
+
+    if CONF_INTERNAL_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_INTERNAL_TEMPERATURE])
+        cg.add(var.set_internal_temperature_sensor(sens))
+
+    if CONF_EXTERNAL_TEMPERATURE in config:
+        sens = await sensor.new_sensor(config[CONF_EXTERNAL_TEMPERATURE])
+        cg.add(var.set_external_temperature_sensor(sens))
+
+    if CONF_SPEED in config:
+        sens = await sensor.new_sensor(config[CONF_SPEED])
+        cg.add(var.set_speed_sensor(sens))
+
+    if CONF_DUTY_CYCLE in config:
+        sens = await sensor.new_sensor(config[CONF_DUTY_CYCLE])
+        cg.add(var.set_duty_cycle_sensor(sens))
diff --git a/esphome/components/emc2101/sensor/emc2101_sensor.cpp b/esphome/components/emc2101/sensor/emc2101_sensor.cpp
new file mode 100644
index 0000000000..2a199f48e9
--- /dev/null
+++ b/esphome/components/emc2101/sensor/emc2101_sensor.cpp
@@ -0,0 +1,43 @@
+#include "emc2101_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace emc2101 {
+
+static const char *const TAG = "EMC2101.sensor";
+
+float EMC2101Sensor::get_setup_priority() const { return setup_priority::DATA; }
+
+void EMC2101Sensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "Emc2101 sensor:");
+  LOG_SENSOR("  ", "Internal temperature", this->internal_temperature_sensor_);
+  LOG_SENSOR("  ", "External temperature", this->external_temperature_sensor_);
+  LOG_SENSOR("  ", "Speed", this->speed_sensor_);
+  LOG_SENSOR("  ", "Duty cycle", this->duty_cycle_sensor_);
+}
+
+void EMC2101Sensor::update() {
+  if (this->internal_temperature_sensor_ != nullptr) {
+    float internal_temperature = this->parent_->get_internal_temperature();
+    this->internal_temperature_sensor_->publish_state(internal_temperature);
+  }
+
+  if (this->external_temperature_sensor_ != nullptr) {
+    float external_temperature = this->parent_->get_external_temperature();
+    this->external_temperature_sensor_->publish_state(external_temperature);
+  }
+
+  if (this->speed_sensor_ != nullptr) {
+    float speed = this->parent_->get_speed();
+    this->speed_sensor_->publish_state(speed);
+  }
+
+  if (this->duty_cycle_sensor_ != nullptr) {
+    float duty_cycle = this->parent_->get_duty_cycle();
+    this->duty_cycle_sensor_->publish_state(duty_cycle * 100.0f);
+  }
+}
+
+}  // namespace emc2101
+}  // namespace esphome
diff --git a/esphome/components/emc2101/sensor/emc2101_sensor.h b/esphome/components/emc2101/sensor/emc2101_sensor.h
new file mode 100644
index 0000000000..3e8dcebc8e
--- /dev/null
+++ b/esphome/components/emc2101/sensor/emc2101_sensor.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "../emc2101.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
+
+namespace esphome {
+namespace emc2101 {
+
+/// This class exposes the EMC2101 sensors.
+class EMC2101Sensor : public PollingComponent {
+ public:
+  EMC2101Sensor(Emc2101Component *parent) : parent_(parent) {}
+  /** Used by ESPHome framework. */
+  void dump_config() override;
+  /** Used by ESPHome framework. */
+  void update() override;
+  /** Used by ESPHome framework. */
+  float get_setup_priority() const override;
+
+  /** Used by ESPHome framework. */
+  void set_internal_temperature_sensor(sensor::Sensor *sensor) { this->internal_temperature_sensor_ = sensor; }
+  /** Used by ESPHome framework. */
+  void set_external_temperature_sensor(sensor::Sensor *sensor) { this->external_temperature_sensor_ = sensor; }
+  /** Used by ESPHome framework. */
+  void set_speed_sensor(sensor::Sensor *sensor) { this->speed_sensor_ = sensor; }
+  /** Used by ESPHome framework. */
+  void set_duty_cycle_sensor(sensor::Sensor *sensor) { this->duty_cycle_sensor_ = sensor; }
+
+ protected:
+  Emc2101Component *parent_;
+  sensor::Sensor *internal_temperature_sensor_{nullptr};
+  sensor::Sensor *external_temperature_sensor_{nullptr};
+  sensor::Sensor *speed_sensor_{nullptr};
+  sensor::Sensor *duty_cycle_sensor_{nullptr};
+};
+
+}  // namespace emc2101
+}  // namespace esphome

From fdef6c6d462a06ba7b45bc948b2634a7c9e36446 Mon Sep 17 00:00:00 2001
From: Roger Busser <roger_busser@hotmail.com>
Date: Wed, 25 Oct 2023 20:31:39 +0200
Subject: [PATCH 061/131] Update current_based_cover bugfix (#5587)

---
 esphome/components/current_based/current_based_cover.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/current_based/current_based_cover.cpp b/esphome/components/current_based/current_based_cover.cpp
index 17f67002a3..8404e07894 100644
--- a/esphome/components/current_based/current_based_cover.cpp
+++ b/esphome/components/current_based/current_based_cover.cpp
@@ -104,7 +104,8 @@ void CurrentBasedCover::loop() {
       ESP_LOGD(TAG, "'%s' - Close position reached. Took %.1fs.", this->name_.c_str(), dur);
       this->direction_idle_(COVER_CLOSED);
     }
-  } else if (now - this->start_dir_time_ > this->max_duration_) {
+  }
+  if (now - this->start_dir_time_ > this->max_duration_) {
     ESP_LOGD(TAG, "'%s' - Max duration reached. Stopping cover.", this->name_.c_str());
     this->direction_idle_();
   }

From 258b0fbff35ca153a54dffefa5b5dbf2fe0ffb48 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Wed, 25 Oct 2023 15:23:55 -0400
Subject: [PATCH 062/131] Fix: Incorporate unique serial number in preference's
 hash for multiple Sensirion sensors (#5479)

---
 esphome/components/sen5x/sen5x.cpp | 8 ++++++--
 esphome/components/sgp30/sgp30.cpp | 5 +++--
 esphome/components/sgp4x/sgp4x.cpp | 5 +++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/esphome/components/sen5x/sen5x.cpp b/esphome/components/sen5x/sen5x.cpp
index 8b4dcda9ef..42951d6089 100644
--- a/esphome/components/sen5x/sen5x.cpp
+++ b/esphome/components/sen5x/sen5x.cpp
@@ -1,5 +1,6 @@
 #include "sen5x.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
 #include <cinttypes>
 
@@ -135,9 +136,12 @@ void SEN5XComponent::setup() {
       ESP_LOGD(TAG, "Firmware version %d", this->firmware_version_);
 
       if (this->voc_sensor_ && this->store_baseline_) {
-        // Hash with compilation time
+        uint32_t combined_serial =
+            encode_uint24(this->serial_number_[0], this->serial_number_[1], this->serial_number_[2]);
+        // Hash with compilation time and serial number
         // This ensures the baseline storage is cleared after OTA
-        uint32_t hash = fnv1_hash(App.get_compilation_time());
+        // Serial numbers are unique to each sensor, so mulitple sensors can be used without conflict
+        uint32_t hash = fnv1_hash(App.get_compilation_time() + std::to_string(combined_serial));
         this->pref_ = global_preferences->make_preference<Sen5xBaselines>(hash, true);
 
         if (this->pref_.load(&this->voc_baselines_storage_)) {
diff --git a/esphome/components/sgp30/sgp30.cpp b/esphome/components/sgp30/sgp30.cpp
index 0910a32a35..261604b992 100644
--- a/esphome/components/sgp30/sgp30.cpp
+++ b/esphome/components/sgp30/sgp30.cpp
@@ -73,9 +73,10 @@ void SGP30Component::setup() {
     return;
   }
 
-  // Hash with compilation time
+  // Hash with compilation time and serial number
   // This ensures the baseline storage is cleared after OTA
-  uint32_t hash = fnv1_hash(App.get_compilation_time());
+  // Serial numbers are unique to each sensor, so mulitple sensors can be used without conflict
+  uint32_t hash = fnv1_hash(App.get_compilation_time() + std::to_string(this->serial_number_));
   this->pref_ = global_preferences->make_preference<SGP30Baselines>(hash, true);
 
   if (this->pref_.load(&this->baselines_storage_)) {
diff --git a/esphome/components/sgp4x/sgp4x.cpp b/esphome/components/sgp4x/sgp4x.cpp
index 52f9adc808..a48372aab7 100644
--- a/esphome/components/sgp4x/sgp4x.cpp
+++ b/esphome/components/sgp4x/sgp4x.cpp
@@ -61,9 +61,10 @@ void SGP4xComponent::setup() {
   ESP_LOGD(TAG, "Product version: 0x%0X", uint16_t(this->featureset_ & 0x1FF));
 
   if (this->store_baseline_) {
-    // Hash with compilation time
+    // Hash with compilation time and serial number
     // This ensures the baseline storage is cleared after OTA
-    uint32_t hash = fnv1_hash(App.get_compilation_time());
+    // Serial numbers are unique to each sensor, so mulitple sensors can be used without conflict
+    uint32_t hash = fnv1_hash(App.get_compilation_time() + std::to_string(this->serial_number_));
     this->pref_ = global_preferences->make_preference<SGP4xBaselines>(hash, true);
 
     if (this->pref_.load(&this->voc_baselines_storage_)) {

From 841b24f7446ea26b65cbaa1f8693ec7bfe64eb46 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Wed, 25 Oct 2023 15:29:21 -0400
Subject: [PATCH 063/131] Add support for Qwiic PIR binary sensor (#5194)

---
 CODEOWNERS                                    |   1 +
 esphome/components/qwiic_pir/__init__.py      |   0
 esphome/components/qwiic_pir/binary_sensor.py |  67 +++++++++
 esphome/components/qwiic_pir/qwiic_pir.cpp    | 137 ++++++++++++++++++
 esphome/components/qwiic_pir/qwiic_pir.h      |  70 +++++++++
 tests/test1.yaml                              |   3 +
 6 files changed, 278 insertions(+)
 create mode 100644 esphome/components/qwiic_pir/__init__.py
 create mode 100644 esphome/components/qwiic_pir/binary_sensor.py
 create mode 100644 esphome/components/qwiic_pir/qwiic_pir.cpp
 create mode 100644 esphome/components/qwiic_pir/qwiic_pir.h

diff --git a/CODEOWNERS b/CODEOWNERS
index b2c0d013be..2e8a828982 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -234,6 +234,7 @@ esphome/components/pulse_meter/* @TrentHouliston @cstaahl @stevebaxter
 esphome/components/pvvx_mithermometer/* @pasiz
 esphome/components/qmp6988/* @andrewpc
 esphome/components/qr_code/* @wjtje
+esphome/components/qwiic_pir/* @kahrendt
 esphome/components/radon_eye_ble/* @jeffeb3
 esphome/components/radon_eye_rd200/* @jeffeb3
 esphome/components/rc522/* @glmnet
diff --git a/esphome/components/qwiic_pir/__init__.py b/esphome/components/qwiic_pir/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/esphome/components/qwiic_pir/binary_sensor.py b/esphome/components/qwiic_pir/binary_sensor.py
new file mode 100644
index 0000000000..360f8b506a
--- /dev/null
+++ b/esphome/components/qwiic_pir/binary_sensor.py
@@ -0,0 +1,67 @@
+from esphome import core
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, binary_sensor
+from esphome.const import (
+    CONF_DEBOUNCE,
+    DEVICE_CLASS_MOTION,
+)
+
+DEPENDENCIES = ["i2c"]
+CODEOWNERS = ["@kahrendt"]
+
+qwiic_pir_ns = cg.esphome_ns.namespace("qwiic_pir")
+
+DebounceMode = qwiic_pir_ns.enum("DebounceMode")
+DEBOUNCE_MODE_OPTIONS = {
+    "RAW": DebounceMode.RAW_DEBOUNCE_MODE,
+    "NATIVE": DebounceMode.NATIVE_DEBOUNCE_MODE,
+    "HYBRID": DebounceMode.HYBRID_DEBOUNCE_MODE,
+}
+
+CONF_DEBOUNCE_MODE = "debounce_mode"
+
+QwiicPIRComponent = qwiic_pir_ns.class_(
+    "QwiicPIRComponent", cg.Component, i2c.I2CDevice, binary_sensor.BinarySensor
+)
+
+
+def validate_no_debounce_unless_native(config):
+    if CONF_DEBOUNCE in config:
+        if config[CONF_DEBOUNCE_MODE] != "NATIVE":
+            raise cv.Invalid("debounce can only be set if debounce_mode is NATIVE")
+    return config
+
+
+CONFIG_SCHEMA = cv.All(
+    binary_sensor.binary_sensor_schema(
+        QwiicPIRComponent,
+        device_class=DEVICE_CLASS_MOTION,
+    )
+    .extend(
+        {
+            cv.Optional(CONF_DEBOUNCE): cv.All(
+                cv.time_period,
+                cv.Range(max=core.TimePeriod(milliseconds=65535)),
+            ),
+            cv.Optional(CONF_DEBOUNCE_MODE, default="HYBRID"): cv.enum(
+                DEBOUNCE_MODE_OPTIONS, upper=True
+            ),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(i2c.i2c_device_schema(0x12)),
+    validate_no_debounce_unless_native,
+)
+
+
+async def to_code(config):
+    var = await binary_sensor.new_binary_sensor(config)
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if debounce_time_setting := config.get(CONF_DEBOUNCE):
+        cg.add(var.set_debounce_time(debounce_time_setting.total_milliseconds))
+    else:
+        cg.add(var.set_debounce_time(1))  # default to 1 ms if not configured
+    cg.add(var.set_debounce_mode(config[CONF_DEBOUNCE_MODE]))
diff --git a/esphome/components/qwiic_pir/qwiic_pir.cpp b/esphome/components/qwiic_pir/qwiic_pir.cpp
new file mode 100644
index 0000000000..c267554c45
--- /dev/null
+++ b/esphome/components/qwiic_pir/qwiic_pir.cpp
@@ -0,0 +1,137 @@
+#include "qwiic_pir.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace qwiic_pir {
+
+static const char *const TAG = "qwiic_pir";
+
+void QwiicPIRComponent::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up Qwiic PIR...");
+
+  // Verify I2C communcation by reading and verifying the chip ID
+  uint8_t chip_id;
+
+  if (!this->read_byte(QWIIC_PIR_CHIP_ID, &chip_id)) {
+    ESP_LOGE(TAG, "Failed to read the chip's ID");
+
+    this->error_code_ = ERROR_COMMUNICATION_FAILED;
+    this->mark_failed();
+
+    return;
+  }
+
+  if (chip_id != QWIIC_PIR_DEVICE_ID) {
+    ESP_LOGE(TAG, "Unknown chip ID, is this a Qwiic PIR?");
+
+    this->error_code_ = ERROR_WRONG_CHIP_ID;
+    this->mark_failed();
+
+    return;
+  }
+
+  if (!this->write_byte_16(QWIIC_PIR_DEBOUNCE_TIME, this->debounce_time_)) {
+    ESP_LOGE(TAG, "Failed to configure debounce time.");
+
+    this->error_code_ = ERROR_COMMUNICATION_FAILED;
+    this->mark_failed();
+
+    return;
+  }
+
+  if (this->debounce_mode_ == NATIVE_DEBOUNCE_MODE) {
+    // Publish the starting raw state of the PIR sensor
+    // If NATIVE mode, the binary_sensor state would be unknown until a motion event
+    if (!this->read_byte(QWIIC_PIR_EVENT_STATUS, &this->event_register_.reg)) {
+      ESP_LOGE(TAG, "Failed to read initial sensor state.");
+
+      this->error_code_ = ERROR_COMMUNICATION_FAILED;
+      this->mark_failed();
+
+      return;
+    }
+
+    this->publish_state(this->event_register_.raw_reading);
+  }
+}
+
+void QwiicPIRComponent::loop() {
+  // Read Event Register
+  if (!this->read_byte(QWIIC_PIR_EVENT_STATUS, &this->event_register_.reg)) {
+    ESP_LOGW(TAG, "Failed to communicate with sensor");
+
+    return;
+  }
+
+  if (this->debounce_mode_ == HYBRID_DEBOUNCE_MODE) {
+    // Use a combination of the raw sensor reading and the device's event detection to determine state
+    //  - The device is hardcoded to use a debounce time of 1 ms in this mode
+    //  - Any event, even if it is object_removed, implies motion was active since the last loop, so publish true
+    //  - Use ESPHome's built-in filters for debouncing
+    this->publish_state(this->event_register_.raw_reading || this->event_register_.event_available);
+
+    if (this->event_register_.event_available) {
+      this->clear_events_();
+    }
+  } else if (this->debounce_mode_ == NATIVE_DEBOUNCE_MODE) {
+    // Uses the device's firmware to debounce the signal
+    //  - Follows the logic of SparkFun's example implementation:
+    //    https://github.com/sparkfun/SparkFun_Qwiic_PIR_Arduino_Library/blob/master/examples/Example2_PrintPIRStatus/Example2_PrintPIRStatus.ino
+    //    (accessed July 2023)
+    //  - Is unreliable at detecting an object being removed, especially at debounce rates even slightly large
+    if (this->event_register_.event_available) {
+      // If an object is detected, publish true
+      if (this->event_register_.object_detected)
+        this->publish_state(true);
+
+      // If an object has been removed, publish false
+      if (this->event_register_.object_removed)
+        this->publish_state(false);
+
+      this->clear_events_();
+    }
+  } else if (this->debounce_mode_ == RAW_DEBOUNCE_MODE) {
+    // Publishes the raw PIR sensor reading with no further logic
+    //  - May miss a very short motion detection if the ESP's loop time is slow
+    this->publish_state(this->event_register_.raw_reading);
+  }
+}
+
+void QwiicPIRComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "Qwiic PIR:");
+
+  if (this->debounce_mode_ == RAW_DEBOUNCE_MODE) {
+    ESP_LOGCONFIG(TAG, "  Debounce Mode: RAW");
+  } else if (this->debounce_mode_ == NATIVE_DEBOUNCE_MODE) {
+    ESP_LOGCONFIG(TAG, "  Debounce Mode: NATIVE");
+    ESP_LOGCONFIG(TAG, "  Debounce Time: %ums", this->debounce_time_);
+  } else if (this->debounce_mode_ == HYBRID_DEBOUNCE_MODE) {
+    ESP_LOGCONFIG(TAG, "  Debounce Mode: HYBRID");
+  }
+
+  switch (this->error_code_) {
+    case NONE:
+      break;
+    case ERROR_COMMUNICATION_FAILED:
+      ESP_LOGE(TAG, "  Communication with Qwiic PIR failed!");
+      break;
+    case ERROR_WRONG_CHIP_ID:
+      ESP_LOGE(TAG, "  Qwiic PIR has wrong chip ID - please verify you are using a Qwiic PIR");
+      break;
+    default:
+      ESP_LOGE(TAG, "  Qwiic PIR error code %d", (int) this->error_code_);
+      break;
+  }
+
+  LOG_I2C_DEVICE(this);
+  LOG_BINARY_SENSOR("  ", "Qwiic PIR Binary Sensor", this);
+}
+
+void QwiicPIRComponent::clear_events_() {
+  // Clear event status register
+  if (!this->write_byte(QWIIC_PIR_EVENT_STATUS, 0x00))
+    ESP_LOGW(TAG, "Failed to clear events on sensor");
+}
+
+}  // namespace qwiic_pir
+}  // namespace esphome
diff --git a/esphome/components/qwiic_pir/qwiic_pir.h b/esphome/components/qwiic_pir/qwiic_pir.h
new file mode 100644
index 0000000000..d58d67734f
--- /dev/null
+++ b/esphome/components/qwiic_pir/qwiic_pir.h
@@ -0,0 +1,70 @@
+/*
+ * Adds support for Qwiic PIR motion sensors that communicate over an I2C bus.
+ * These sensors use Sharp PIR motion sensors to detect motion. A firmware running on an ATTiny84 translates the digital
+ * output to I2C communications.
+ * ATTiny84 firmware: https://github.com/sparkfun/Qwiic_PIR (acccessed July 2023)
+ * SparkFun's Arduino library: https://github.com/sparkfun/SparkFun_Qwiic_PIR_Arduino_Library (accessed July 2023)
+ */
+
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace qwiic_pir {
+
+// Qwiic PIR I2C Register Addresses
+enum {
+  QWIIC_PIR_CHIP_ID = 0x00,
+  QWIIC_PIR_EVENT_STATUS = 0x03,
+  QWIIC_PIR_DEBOUNCE_TIME = 0x05,  // uint16_t debounce time in milliseconds
+};
+
+enum DebounceMode {
+  RAW_DEBOUNCE_MODE,
+  NATIVE_DEBOUNCE_MODE,
+  HYBRID_DEBOUNCE_MODE,
+};
+
+static const uint8_t QWIIC_PIR_DEVICE_ID = 0x72;
+
+class QwiicPIRComponent : public Component, public i2c::I2CDevice, public binary_sensor::BinarySensor {
+ public:
+  void setup() override;
+  void loop() override;
+
+  void dump_config() override;
+  float get_setup_priority() const override { return setup_priority::DATA; }
+
+  void set_debounce_time(uint16_t debounce_time) { this->debounce_time_ = debounce_time; }
+  void set_debounce_mode(DebounceMode mode) { this->debounce_mode_ = mode; }
+
+ protected:
+  uint16_t debounce_time_{};
+
+  DebounceMode debounce_mode_{};
+
+  enum ErrorCode {
+    NONE = 0,
+    ERROR_COMMUNICATION_FAILED,
+    ERROR_WRONG_CHIP_ID,
+  } error_code_{NONE};
+
+  union {
+    struct {
+      bool raw_reading : 1;      // raw state of PIR sensor
+      bool event_available : 1;  // a debounced object has been detected or removed
+      bool object_removed : 1;   // a debounced object is no longer detected
+      bool object_detected : 1;  // a debounced object has been detected
+      bool : 4;
+    };
+    uint8_t reg;
+  } event_register_ = {.reg = 0};
+
+  void clear_events_();
+};
+
+}  // namespace qwiic_pir
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0edc0bbaa7..0d95dd6cb8 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -1813,6 +1813,9 @@ binary_sensor:
       name: still
     out_pin_presence_status:
       name: out pin presence status
+  - platform: qwiic_pir
+    i2c_id: i2c_bus
+    name: "Qwiic PIR Motion Sensor"
 
 pca9685:
   frequency: 500

From 93056dead9327b0d482b0e782d31dc85ac98ab8c Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Wed, 25 Oct 2023 16:30:23 -0400
Subject: [PATCH 064/131] Add ignore out of range option for clamp filter
 (#5455)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/sensor/__init__.py |  3 +++
 esphome/components/sensor/filter.cpp  | 22 +++++++++++++++++-----
 esphome/components/sensor/filter.h    |  3 ++-
 esphome/const.py                      |  1 +
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/esphome/components/sensor/__init__.py b/esphome/components/sensor/__init__.py
index bd7306ac28..b3bf533695 100644
--- a/esphome/components/sensor/__init__.py
+++ b/esphome/components/sensor/__init__.py
@@ -16,6 +16,7 @@ from esphome.const import (
     CONF_FROM,
     CONF_ICON,
     CONF_ID,
+    CONF_IGNORE_OUT_OF_RANGE,
     CONF_ON_RAW_VALUE,
     CONF_ON_VALUE,
     CONF_ON_VALUE_RANGE,
@@ -688,6 +689,7 @@ CLAMP_SCHEMA = cv.All(
         {
             cv.Optional(CONF_MIN_VALUE, default="NaN"): cv.float_,
             cv.Optional(CONF_MAX_VALUE, default="NaN"): cv.float_,
+            cv.Optional(CONF_IGNORE_OUT_OF_RANGE, default=False): cv.boolean,
         }
     ),
     validate_clamp,
@@ -700,6 +702,7 @@ async def clamp_filter_to_code(config, filter_id):
         filter_id,
         config[CONF_MIN_VALUE],
         config[CONF_MAX_VALUE],
+        config[CONF_IGNORE_OUT_OF_RANGE],
     )
 
 
diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index af67a60754..d1cb8d1c4b 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -434,13 +434,25 @@ optional<float> CalibratePolynomialFilter::new_value(float value) {
   return res;
 }
 
-ClampFilter::ClampFilter(float min, float max) : min_(min), max_(max) {}
+ClampFilter::ClampFilter(float min, float max, bool ignore_out_of_range)
+    : min_(min), max_(max), ignore_out_of_range_(ignore_out_of_range) {}
 optional<float> ClampFilter::new_value(float value) {
   if (std::isfinite(value)) {
-    if (std::isfinite(this->min_) && value < this->min_)
-      return this->min_;
-    if (std::isfinite(this->max_) && value > this->max_)
-      return this->max_;
+    if (std::isfinite(this->min_) && value < this->min_) {
+      if (this->ignore_out_of_range_) {
+        return {};
+      } else {
+        return this->min_;
+      }
+    }
+
+    if (std::isfinite(this->max_) && value > this->max_) {
+      if (this->ignore_out_of_range_) {
+        return {};
+      } else {
+        return this->max_;
+      }
+    }
   }
   return value;
 }
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index d4239837b6..fa78f2fa46 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -411,12 +411,13 @@ class CalibratePolynomialFilter : public Filter {
 
 class ClampFilter : public Filter {
  public:
-  ClampFilter(float min, float max);
+  ClampFilter(float min, float max, bool ignore_out_of_range);
   optional<float> new_value(float value) override;
 
  protected:
   float min_{NAN};
   float max_{NAN};
+  bool ignore_out_of_range_;
 };
 
 class RoundFilter : public Filter {
diff --git a/esphome/const.py b/esphome/const.py
index 9e0bd4da0a..47eedc24b7 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -335,6 +335,7 @@ CONF_IDLE_LEVEL = "idle_level"
 CONF_IDLE_TIME = "idle_time"
 CONF_IF = "if"
 CONF_IGNORE_EFUSE_MAC_CRC = "ignore_efuse_mac_crc"
+CONF_IGNORE_OUT_OF_RANGE = "ignore_out_of_range"
 CONF_IGNORE_STRAPPING_WARNING = "ignore_strapping_warning"
 CONF_IIR_FILTER = "iir_filter"
 CONF_ILLUMINANCE = "illuminance"

From 4774200f6b79b985e6c2fbe3db2bfa77e38c4a27 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:37:06 +1300
Subject: [PATCH 065/131] Print text mqtt command topic (#5601)

---
 esphome/components/mqtt/mqtt_text.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/mqtt/mqtt_text.cpp b/esphome/components/mqtt/mqtt_text.cpp
index 58978faead..cb852b64cd 100644
--- a/esphome/components/mqtt/mqtt_text.cpp
+++ b/esphome/components/mqtt/mqtt_text.cpp
@@ -27,7 +27,7 @@ void MQTTTextComponent::setup() {
 
 void MQTTTextComponent::dump_config() {
   ESP_LOGCONFIG(TAG, "MQTT text '%s':", this->text_->get_name().c_str());
-  LOG_MQTT_COMPONENT(true, false)
+  LOG_MQTT_COMPONENT(true, true)
 }
 
 std::string MQTTTextComponent::component_type() const { return "text"; }

From 8b9a7608f0ebad9b12b17eeb6d5843761f5a62b2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 26 Oct 2023 13:37:50 +1300
Subject: [PATCH 066/131] Correctly allow mqtt topics to be none so ESPHome
 does not sub/pub to them (#5213)

---
 esphome/components/mqtt/mqtt_component.cpp | 31 ++++++++++++++++------
 esphome/components/mqtt/mqtt_component.h   |  3 +++
 esphome/config_validation.py               |  2 ++
 tests/test5.yaml                           |  2 ++
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/esphome/components/mqtt/mqtt_component.cpp b/esphome/components/mqtt/mqtt_component.cpp
index 1c7d9f86dd..571f5c8317 100644
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -2,9 +2,9 @@
 
 #ifdef USE_MQTT
 
-#include "esphome/core/log.h"
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
 #include "esphome/core/version.h"
 
 #include "mqtt_const.h"
@@ -28,15 +28,15 @@ std::string MQTTComponent::get_default_topic_for_(const std::string &suffix) con
 }
 
 std::string MQTTComponent::get_state_topic_() const {
-  if (this->custom_state_topic_.empty())
-    return this->get_default_topic_for_("state");
-  return this->custom_state_topic_;
+  if (this->has_custom_state_topic_)
+    return this->custom_state_topic_;
+  return this->get_default_topic_for_("state");
 }
 
 std::string MQTTComponent::get_command_topic_() const {
-  if (this->custom_command_topic_.empty())
-    return this->get_default_topic_for_("command");
-  return this->custom_command_topic_;
+  if (this->has_custom_command_topic_)
+    return this->custom_command_topic_;
+  return this->get_default_topic_for_("command");
 }
 
 bool MQTTComponent::publish(const std::string &topic, const std::string &payload) {
@@ -171,9 +171,11 @@ float MQTTComponent::get_setup_priority() const { return setup_priority::AFTER_C
 void MQTTComponent::disable_discovery() { this->discovery_enabled_ = false; }
 void MQTTComponent::set_custom_state_topic(const std::string &custom_state_topic) {
   this->custom_state_topic_ = custom_state_topic;
+  this->has_custom_state_topic_ = true;
 }
 void MQTTComponent::set_custom_command_topic(const std::string &custom_command_topic) {
   this->custom_command_topic_ = custom_command_topic;
+  this->has_custom_command_topic_ = true;
 }
 void MQTTComponent::set_command_retain(bool command_retain) { this->command_retain_ = command_retain; }
 
@@ -240,7 +242,20 @@ bool MQTTComponent::is_connected_() const { return global_mqtt_client->is_connec
 std::string MQTTComponent::friendly_name() const { return this->get_entity()->get_name(); }
 std::string MQTTComponent::get_icon() const { return this->get_entity()->get_icon(); }
 bool MQTTComponent::is_disabled_by_default() const { return this->get_entity()->is_disabled_by_default(); }
-bool MQTTComponent::is_internal() { return this->get_entity()->is_internal(); }
+bool MQTTComponent::is_internal() {
+  if ((this->get_state_topic_().empty()) || (this->get_command_topic_().empty())) {
+    // If both state_topic and command_topic are empty, then the entity is internal to mqtt
+    return true;
+  }
+
+  if (this->has_custom_state_topic_ || this->has_custom_command_topic_) {
+    // If a custom state_topic or command_topic is set, then the entity is not internal to mqtt
+    return false;
+  }
+
+  // Use ESPHome's entity internal state
+  return this->get_entity()->is_internal();
+}
 
 }  // namespace mqtt
 }  // namespace esphome
diff --git a/esphome/components/mqtt/mqtt_component.h b/esphome/components/mqtt/mqtt_component.h
index 16a00cfdde..aacfe8891f 100644
--- a/esphome/components/mqtt/mqtt_component.h
+++ b/esphome/components/mqtt/mqtt_component.h
@@ -190,6 +190,9 @@ class MQTTComponent : public Component {
 
   std::string custom_state_topic_{};
   std::string custom_command_topic_{};
+  bool has_custom_state_topic_{false};
+  bool has_custom_command_topic_{false};
+
   bool command_retain_{false};
   bool retain_{true};
   bool discovery_enabled_{true};
diff --git a/esphome/config_validation.py b/esphome/config_validation.py
index 1b95370fdf..d2b381215e 100644
--- a/esphome/config_validation.py
+++ b/esphome/config_validation.py
@@ -1047,6 +1047,8 @@ def ipv4(value):
 
 def _valid_topic(value):
     """Validate that this is a valid topic name/filter."""
+    if value is None:  # Used to disable publishing and subscribing
+        return ""
     if isinstance(value, dict):
         raise Invalid("Can't use dictionary with topic")
     value = string(value)
diff --git a/tests/test5.yaml b/tests/test5.yaml
index d87a7f50d4..82c201f017 100644
--- a/tests/test5.yaml
+++ b/tests/test5.yaml
@@ -64,6 +64,7 @@ mqtt:
   discovery: true
   discovery_prefix: homeassistant
   idf_send_async: false
+  log_topic:
   on_message:
     topic: testing/sensor/testing_sensor/state
     qos: 0
@@ -403,6 +404,7 @@ sensor:
     update_interval: 1s
   - platform: internal_temperature
     name: Internal Temperature
+    state_topic:
   - platform: selec_meter
     total_active_energy:
       name: SelecEM2M Total Active Energy

From 6b8a75d3b8511a3b12199f7419df4e524a0c6100 Mon Sep 17 00:00:00 2001
From: tracestep <16390082+tracestep@users.noreply.github.com>
Date: Wed, 25 Oct 2023 23:36:58 -0300
Subject: [PATCH 067/131] SX1509 output debounce fix (resolves
 esphome/issues#4402) (#4672)

---
 esphome/components/sx1509/sx1509.cpp | 14 ++++++++++++--
 esphome/components/sx1509/sx1509.h   |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/esphome/components/sx1509/sx1509.cpp b/esphome/components/sx1509/sx1509.cpp
index d0a84b99ff..ee90e0e410 100644
--- a/esphome/components/sx1509/sx1509.cpp
+++ b/esphome/components/sx1509/sx1509.cpp
@@ -68,9 +68,18 @@ void SX1509Component::digital_write(uint8_t pin, bool bit_value) {
     uint16_t temp_reg_data = 0;
     this->read_byte_16(REG_DATA_B, &temp_reg_data);
     if (bit_value) {
-      temp_reg_data |= (1 << pin);
+      output_state_ |= (1 << pin);  // set bit in shadow register
     } else {
-      temp_reg_data &= ~(1 << pin);
+      output_state_ &= ~(1 << pin);  // reset bit shadow register
+    }
+    for (uint16_t b = 0x8000; b; b >>= 1) {
+      if ((~ddr_mask_) & b) {  // transfer bits of outputs, but don't mess with inputs
+        if (output_state_ & b) {
+          temp_reg_data |= b;
+        } else {
+          temp_reg_data &= ~b;
+        }
+      }
     }
     this->write_byte_16(REG_DATA_B, temp_reg_data);
   }
@@ -134,6 +143,7 @@ void SX1509Component::setup_led_driver(uint8_t pin) {
 
   this->read_byte_16(REG_DATA_B, &temp_word);
   temp_word &= ~(1 << pin);
+  output_state_ &= ~(1 << pin);
   this->write_byte_16(REG_DATA_B, temp_word);
 }
 
diff --git a/esphome/components/sx1509/sx1509.h b/esphome/components/sx1509/sx1509.h
index 8e3b41e233..9e4f31aab0 100644
--- a/esphome/components/sx1509/sx1509.h
+++ b/esphome/components/sx1509/sx1509.h
@@ -61,6 +61,7 @@ class SX1509Component : public Component, public i2c::I2CDevice {
   uint16_t ddr_mask_ = 0x00;
   uint16_t input_mask_ = 0x00;
   uint16_t port_mask_ = 0x00;
+  uint16_t output_state_ = 0x00;
   bool has_keypad_ = false;
   uint8_t rows_ = 0;
   uint8_t cols_ = 0;

From f6e8d97981a95c5af729ed13b239360381aedf3a Mon Sep 17 00:00:00 2001
From: dentra <dentra@users.noreply.github.com>
Date: Thu, 26 Oct 2023 23:27:42 +0300
Subject: [PATCH 068/131] Add details when error loading package (#5603)

---
 esphome/components/packages/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/packages/__init__.py b/esphome/components/packages/__init__.py
index 56a59c54d1..2b064a90cf 100644
--- a/esphome/components/packages/__init__.py
+++ b/esphome/components/packages/__init__.py
@@ -135,7 +135,7 @@ def _process_base_package(config: dict) -> dict:
                 packages[file] = new_yaml
             except EsphomeError as e:
                 raise cv.Invalid(
-                    f"{file} is not a valid YAML file. Please check the file contents."
+                    f"{file} is not a valid YAML file. Please check the file contents.\n{e}"
                 ) from e
         return packages
 

From cfbf3681f35663becde029dafbe5b8a0b0927ff9 Mon Sep 17 00:00:00 2001
From: dentra <dentra@users.noreply.github.com>
Date: Fri, 27 Oct 2023 00:16:43 +0300
Subject: [PATCH 069/131] Fallback to main secrets.yaml for packages (#5604)

---
 esphome/yaml_util.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/esphome/yaml_util.py b/esphome/yaml_util.py
index 8a03c431a7..3d3fa8c5b4 100644
--- a/esphome/yaml_util.py
+++ b/esphome/yaml_util.py
@@ -18,6 +18,7 @@ from esphome.core import (
     MACAddress,
     TimePeriod,
     DocumentRange,
+    CORE,
 )
 from esphome.helpers import add_class_to_obj
 from esphome.util import OrderedDict, filter_yaml_files
@@ -240,7 +241,18 @@ class ESPHomeLoader(yaml.SafeLoader):
 
     @_add_data_ref
     def construct_secret(self, node):
-        secrets = _load_yaml_internal(self._rel_path(SECRET_YAML))
+        try:
+            secrets = _load_yaml_internal(self._rel_path(SECRET_YAML))
+        except EsphomeError as e:
+            if self.name == CORE.config_path:
+                raise e
+            try:
+                main_config_dir = os.path.dirname(CORE.config_path)
+                main_secret_yml = os.path.join(main_config_dir, SECRET_YAML)
+                secrets = _load_yaml_internal(main_secret_yml)
+            except EsphomeError as er:
+                raise EsphomeError(f"{e}\n{er}") from er
+
         if node.value not in secrets:
             raise yaml.MarkedYAMLError(
                 f"Secret '{node.value}' not defined", node.start_mark

From bcfbcd9578148dc71241a6dd174b47ca4c0fa358 Mon Sep 17 00:00:00 2001
From: Cossid <83468485+Cossid@users.noreply.github.com>
Date: Thu, 26 Oct 2023 17:38:52 -0500
Subject: [PATCH 070/131] Add area (zone) to esphome core config to be
 suggested through API and MQTT. (#5602)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/api/api.proto           |  2 ++
 esphome/components/api/api_connection.cpp  |  1 +
 esphome/components/api/api_pb2.cpp         |  9 +++++++++
 esphome/components/api/api_pb2.h           |  1 +
 esphome/components/mqtt/mqtt_component.cpp |  2 ++
 esphome/const.py                           |  1 +
 esphome/core/__init__.py                   |  3 +++
 esphome/core/application.h                 | 10 ++++++++--
 esphome/core/config.py                     |  3 +++
 tests/dummy_main.cpp                       |  2 +-
 10 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/esphome/components/api/api.proto b/esphome/components/api/api.proto
index ca3071d6d9..2f33750686 100644
--- a/esphome/components/api/api.proto
+++ b/esphome/components/api/api.proto
@@ -217,6 +217,8 @@ message DeviceInfoResponse {
   string friendly_name = 13;
 
   uint32 voice_assistant_version = 14;
+
+  string suggested_area = 16;
 }
 
 message ListEntitiesRequest {
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index bc61271e93..03eaa159c7 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -1084,6 +1084,7 @@ DeviceInfoResponse APIConnection::device_info(const DeviceInfoRequest &msg) {
   resp.uses_password = this->parent_->uses_password();
   resp.name = App.get_name();
   resp.friendly_name = App.get_friendly_name();
+  resp.suggested_area = App.get_area();
   resp.mac_address = get_mac_address_pretty();
   resp.esphome_version = ESPHOME_VERSION;
   resp.compilation_time = App.get_compilation_time();
diff --git a/esphome/components/api/api_pb2.cpp b/esphome/components/api/api_pb2.cpp
index c070b3c988..1e97a57bb1 100644
--- a/esphome/components/api/api_pb2.cpp
+++ b/esphome/components/api/api_pb2.cpp
@@ -761,6 +761,10 @@ bool DeviceInfoResponse::decode_length(uint32_t field_id, ProtoLengthDelimited v
       this->friendly_name = value.as_string();
       return true;
     }
+    case 16: {
+      this->suggested_area = value.as_string();
+      return true;
+    }
     default:
       return false;
   }
@@ -781,6 +785,7 @@ void DeviceInfoResponse::encode(ProtoWriteBuffer buffer) const {
   buffer.encode_string(12, this->manufacturer);
   buffer.encode_string(13, this->friendly_name);
   buffer.encode_uint32(14, this->voice_assistant_version);
+  buffer.encode_string(16, this->suggested_area);
 }
 #ifdef HAS_PROTO_MESSAGE_DUMP
 void DeviceInfoResponse::dump_to(std::string &out) const {
@@ -849,6 +854,10 @@ void DeviceInfoResponse::dump_to(std::string &out) const {
   sprintf(buffer, "%" PRIu32, this->voice_assistant_version);
   out.append(buffer);
   out.append("\n");
+
+  out.append("  suggested_area: ");
+  out.append("'").append(this->suggested_area).append("'");
+  out.append("\n");
   out.append("}");
 }
 #endif
diff --git a/esphome/components/api/api_pb2.h b/esphome/components/api/api_pb2.h
index b935784831..a63e90b7b7 100644
--- a/esphome/components/api/api_pb2.h
+++ b/esphome/components/api/api_pb2.h
@@ -328,6 +328,7 @@ class DeviceInfoResponse : public ProtoMessage {
   std::string manufacturer{};
   std::string friendly_name{};
   uint32_t voice_assistant_version{0};
+  std::string suggested_area{};
   void encode(ProtoWriteBuffer buffer) const override;
 #ifdef HAS_PROTO_MESSAGE_DUMP
   void dump_to(std::string &out) const override;
diff --git a/esphome/components/mqtt/mqtt_component.cpp b/esphome/components/mqtt/mqtt_component.cpp
index 571f5c8317..95dc082e84 100644
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -136,6 +136,7 @@ bool MQTTComponent::send_discovery_() {
         if (node_friendly_name.empty()) {
           node_friendly_name = node_name;
         }
+        const std::string &node_area = App.get_area();
 
         JsonObject device_info = root.createNestedObject(MQTT_DEVICE);
         device_info[MQTT_DEVICE_IDENTIFIERS] = get_mac_address();
@@ -143,6 +144,7 @@ bool MQTTComponent::send_discovery_() {
         device_info[MQTT_DEVICE_SW_VERSION] = "esphome v" ESPHOME_VERSION " " + App.get_compilation_time();
         device_info[MQTT_DEVICE_MODEL] = ESPHOME_BOARD;
         device_info[MQTT_DEVICE_MANUFACTURER] = "espressif";
+        device_info[MQTT_DEVICE_SUGGESTED_AREA] = node_area;
       },
       0, discovery_info.retain);
 }
diff --git a/esphome/const.py b/esphome/const.py
index 47eedc24b7..6dde15303a 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -53,6 +53,7 @@ CONF_AND = "and"
 CONF_AP = "ap"
 CONF_APPARENT_POWER = "apparent_power"
 CONF_ARDUINO_VERSION = "arduino_version"
+CONF_AREA = "area"
 CONF_ARGS = "args"
 CONF_ASSUMED_STATE = "assumed_state"
 CONF_AT = "at"
diff --git a/esphome/core/__init__.py b/esphome/core/__init__.py
index 52c58cb54a..0b597e0c9e 100644
--- a/esphome/core/__init__.py
+++ b/esphome/core/__init__.py
@@ -464,6 +464,8 @@ class EsphomeCore:
         self.name: Optional[str] = None
         # The friendly name of the node
         self.friendly_name: Optional[str] = None
+        # The area / zone of the node
+        self.area: Optional[str] = None
         # Additional data components can store temporary data in
         # The first key to this dict should always be the integration name
         self.data = {}
@@ -504,6 +506,7 @@ class EsphomeCore:
         self.dashboard = False
         self.name = None
         self.friendly_name = None
+        self.area = None
         self.data = {}
         self.config_path = None
         self.build_path = None
diff --git a/esphome/core/application.h b/esphome/core/application.h
index f2dbaa4db5..059e393912 100644
--- a/esphome/core/application.h
+++ b/esphome/core/application.h
@@ -59,8 +59,8 @@ namespace esphome {
 
 class Application {
  public:
-  void pre_setup(const std::string &name, const std::string &friendly_name, const char *comment,
-                 const char *compilation_time, bool name_add_mac_suffix) {
+  void pre_setup(const std::string &name, const std::string &friendly_name, const std::string &area,
+                 const char *comment, const char *compilation_time, bool name_add_mac_suffix) {
     arch_init();
     this->name_add_mac_suffix_ = name_add_mac_suffix;
     if (name_add_mac_suffix) {
@@ -74,6 +74,7 @@ class Application {
       this->name_ = name;
       this->friendly_name_ = friendly_name;
     }
+    this->area_ = area;
     this->comment_ = comment;
     this->compilation_time_ = compilation_time;
   }
@@ -160,6 +161,10 @@ class Application {
 
   /// Get the friendly name of this Application set by pre_setup().
   const std::string &get_friendly_name() const { return this->friendly_name_; }
+
+  /// Get the area of this Application set by pre_setup().
+  const std::string &get_area() const { return this->area_; }
+
   /// Get the comment of this Application set by pre_setup().
   std::string get_comment() const { return this->comment_; }
 
@@ -395,6 +400,7 @@ class Application {
 
   std::string name_;
   std::string friendly_name_;
+  std::string area_;
   const char *comment_{nullptr};
   const char *compilation_time_{nullptr};
   bool name_add_mac_suffix_;
diff --git a/esphome/core/config.py b/esphome/core/config.py
index 1625644092..e4a1fdcafa 100644
--- a/esphome/core/config.py
+++ b/esphome/core/config.py
@@ -8,6 +8,7 @@ import esphome.config_validation as cv
 from esphome import automation
 from esphome.const import (
     CONF_ARDUINO_VERSION,
+    CONF_AREA,
     CONF_BOARD,
     CONF_BOARD_FLASH_MODE,
     CONF_BUILD_PATH,
@@ -126,6 +127,7 @@ CONFIG_SCHEMA = cv.All(
         {
             cv.Required(CONF_NAME): cv.valid_name,
             cv.Optional(CONF_FRIENDLY_NAME, ""): cv.string,
+            cv.Optional(CONF_AREA, ""): cv.string,
             cv.Optional(CONF_COMMENT): cv.string,
             cv.Required(CONF_BUILD_PATH): cv.string,
             cv.Optional(CONF_PLATFORMIO_OPTIONS, default={}): cv.Schema(
@@ -350,6 +352,7 @@ async def to_code(config):
         cg.App.pre_setup(
             config[CONF_NAME],
             config[CONF_FRIENDLY_NAME],
+            config[CONF_AREA],
             config.get(CONF_COMMENT, ""),
             cg.RawExpression('__DATE__ ", " __TIME__'),
             config[CONF_NAME_ADD_MAC_SUFFIX],
diff --git a/tests/dummy_main.cpp b/tests/dummy_main.cpp
index 236b9f5fc2..da5c6d10d0 100644
--- a/tests/dummy_main.cpp
+++ b/tests/dummy_main.cpp
@@ -12,7 +12,7 @@
 using namespace esphome;
 
 void setup() {
-  App.pre_setup("livingroom", "LivingRoom", "comment", __DATE__ ", " __TIME__, false);
+  App.pre_setup("livingroom", "LivingRoom", "LivingRoomArea", "comment", __DATE__ ", " __TIME__, false);
   auto *log = new logger::Logger(115200, 512);  // NOLINT
   log->pre_setup();
   log->set_uart_selection(logger::UART_SELECTION_UART0);

From a9f4922824159d75b95bd2ff68bf2374962bee43 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 11:56:16 +1300
Subject: [PATCH 071/131] Devcontainer: allow pip install and dont warn about
 root user (#5608)

---
 .devcontainer/devcontainer.json | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ab4f8cc960..c8f94cb6bb 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,17 +1,13 @@
 {
   "name": "ESPHome Dev",
   "image": "ghcr.io/esphome/esphome-lint:dev",
-  "postCreateCommand": [
-    "script/devcontainer-post-create"
-  ],
+  "postCreateCommand": ["script/devcontainer-post-create"],
   "containerEnv": {
-    "DEVCONTAINER": "1"
+    "DEVCONTAINER": "1",
+    "PIP_BREAK_SYSTEM_PACKAGES": "1",
+    "PIP_ROOT_USER_ACTION": "ignore"
   },
-  "runArgs": [
-    "--privileged",
-    "-e",
-    "ESPHOME_DASHBOARD_USE_PING=1"
-  ],
+  "runArgs": ["--privileged", "-e", "ESPHOME_DASHBOARD_USE_PING=1"],
   "appPort": 6052,
   "customizations": {
     "vscode": {
@@ -24,7 +20,7 @@
         // cpp
         "ms-vscode.cpptools",
         // editorconfig
-        "editorconfig.editorconfig",
+        "editorconfig.editorconfig"
       ],
       "settings": {
         "python.languageServer": "Pylance",

From 2adda3a9949a7f1a04512bf57d10ad4a8a6b3c24 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 14:59:10 +1300
Subject: [PATCH 072/131] Validate test files before compiling (#5611)

* Validate test files before compiling

* Dont restrict parallel
---
 .github/workflows/ci.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70da22e57a..8d1daf922f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -221,6 +221,29 @@ jobs:
         id: set-matrix
         run: echo "matrix=$(ls tests/test*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT
 
+  validate-tests:
+    name: Validate YAML test ${{ matrix.file }}
+    runs-on: ubuntu-latest
+    needs:
+      - common
+      - compile-tests-list
+    strategy:
+      fail-fast: false
+      matrix:
+        file: ${{ fromJson(needs.compile-tests-list.outputs.matrix) }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.1
+      - name: Restore Python
+        uses: ./.github/actions/restore-python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          cache-key: ${{ needs.common.outputs.cache-key }}
+      - name: Run esphome config ${{ matrix.file }}
+        run: |
+          . venv/bin/activate
+          esphome config ${{ matrix.file }}
+
   compile-tests:
     name: Run YAML test ${{ matrix.file }}
     runs-on: ubuntu-latest
@@ -234,6 +257,7 @@ jobs:
       - pytest
       - pyupgrade
       - compile-tests-list
+      - validate-tests
     strategy:
       fail-fast: false
       max-parallel: 2

From 535568e065bdc4073a9d2809905d01aaabc9fb1b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:16:44 +1300
Subject: [PATCH 073/131] Minor defines.h updates (#5610)

---
 esphome/core/defines.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/esphome/core/defines.h b/esphome/core/defines.h
index 598b08063b..d4187d4c08 100644
--- a/esphome/core/defines.h
+++ b/esphome/core/defines.h
@@ -78,6 +78,7 @@
 #define USE_VOICE_ASSISTANT
 #define USE_MICROPHONE
 #define USE_SPEAKER
+#define USE_SPI
 
 #ifdef USE_ARDUINO
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(2, 0, 5)
@@ -97,9 +98,7 @@
 #define USE_HTTP_REQUEST_ESP8266_HTTPS
 #define USE_SOCKET_IMPL_LWIP_TCP
 
-#ifdef USE_LIBRETINY
-#define USE_SOCKET_IMPL_LWIP_SOCKETS
-#endif
+#define USE_SPI
 
 // Dummy firmware payload for shelly_dimmer
 #define USE_SHD_FIRMWARE_MAJOR_VERSION 56
@@ -112,6 +111,11 @@
 #ifdef USE_RP2040
 #define USE_ARDUINO_VERSION_CODE VERSION_CODE(3, 3, 0)
 #define USE_SOCKET_IMPL_LWIP_TCP
+#define USE_SPI
+#endif
+
+#ifdef USE_LIBRETINY
+#define USE_SOCKET_IMPL_LWIP_SOCKETS
 #endif
 
 #ifdef USE_HOST

From 0c5d5cd6235e31e2386ac3000ff87f3131b8bcd0 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 27 Oct 2023 16:36:54 +1300
Subject: [PATCH 074/131] timeout filter: return value (#5612)

---
 esphome/components/sensor/filter.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index d1cb8d1c4b..b5bef4930c 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -1,8 +1,8 @@
 #include "filter.h"
+#include <cmath>
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 #include "sensor.h"
-#include <cmath>
 
 namespace esphome {
 namespace sensor {
@@ -376,9 +376,7 @@ void OrFilter::initialize(Sensor *parent, Filter *next) {
 // TimeoutFilter
 optional<float> TimeoutFilter::new_value(float value) {
   this->set_timeout("timeout", this->time_period_, [this]() { this->output(this->value_); });
-  this->output(value);
-
-  return {};
+  return value;
 }
 
 TimeoutFilter::TimeoutFilter(uint32_t time_period, float new_value) : time_period_(time_period), value_(new_value) {}

From 907d43827cc1e617afec7342d28c27054103e7c8 Mon Sep 17 00:00:00 2001
From: niklasweber <niklas.weber_mail@t-online.de>
Date: Fri, 27 Oct 2023 06:56:33 +0200
Subject: [PATCH 075/131] Add dfrobot_sen0395 mmwave radar component (#4203)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   1 +
 .../components/dfrobot_sen0395/__init__.py    | 208 +++++++++++
 .../components/dfrobot_sen0395/automation.h   |  89 +++++
 .../dfrobot_sen0395/binary_sensor.py          |  22 ++
 .../components/dfrobot_sen0395/commands.cpp   | 329 ++++++++++++++++++
 esphome/components/dfrobot_sen0395/commands.h | 156 +++++++++
 .../dfrobot_sen0395/dfrobot_sen0395.cpp       | 142 ++++++++
 .../dfrobot_sen0395/dfrobot_sen0395.h         | 125 +++++++
 .../dfrobot_sen0395/switch/__init__.py        |  65 ++++
 .../switch/dfrobot_sen0395_switch.cpp         |  48 +++
 .../switch/dfrobot_sen0395_switch.h           |  34 ++
 tests/test1.yaml                              |  47 ++-
 12 files changed, 1265 insertions(+), 1 deletion(-)
 create mode 100644 esphome/components/dfrobot_sen0395/__init__.py
 create mode 100644 esphome/components/dfrobot_sen0395/automation.h
 create mode 100644 esphome/components/dfrobot_sen0395/binary_sensor.py
 create mode 100644 esphome/components/dfrobot_sen0395/commands.cpp
 create mode 100644 esphome/components/dfrobot_sen0395/commands.h
 create mode 100644 esphome/components/dfrobot_sen0395/dfrobot_sen0395.cpp
 create mode 100644 esphome/components/dfrobot_sen0395/dfrobot_sen0395.h
 create mode 100644 esphome/components/dfrobot_sen0395/switch/__init__.py
 create mode 100644 esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.cpp
 create mode 100644 esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 2e8a828982..9ebc1ac631 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -77,6 +77,7 @@ esphome/components/dashboard_import/* @esphome/core
 esphome/components/debug/* @OttoWinter
 esphome/components/delonghi/* @grob6000
 esphome/components/dfplayer/* @glmnet
+esphome/components/dfrobot_sen0395/* @niklasweber
 esphome/components/dht/* @OttoWinter
 esphome/components/display_menu_base/* @numo68
 esphome/components/dps310/* @kbx81
diff --git a/esphome/components/dfrobot_sen0395/__init__.py b/esphome/components/dfrobot_sen0395/__init__.py
new file mode 100644
index 0000000000..e772db5a15
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/__init__.py
@@ -0,0 +1,208 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import automation
+from esphome import core
+from esphome.automation import maybe_simple_id
+from esphome.const import CONF_ID
+from esphome.components import uart
+
+CODEOWNERS = ["@niklasweber"]
+DEPENDENCIES = ["uart"]
+MULTI_CONF = True
+
+dfrobot_sen0395_ns = cg.esphome_ns.namespace("dfrobot_sen0395")
+DfrobotSen0395Component = dfrobot_sen0395_ns.class_(
+    "DfrobotSen0395Component", cg.Component
+)
+
+# Actions
+DfrobotSen0395ResetAction = dfrobot_sen0395_ns.class_(
+    "DfrobotSen0395ResetAction", automation.Action
+)
+DfrobotSen0395SettingsAction = dfrobot_sen0395_ns.class_(
+    "DfrobotSen0395SettingsAction", automation.Action
+)
+
+CONF_DFROBOT_SEN0395_ID = "dfrobot_sen0395_id"
+
+CONF_DELAY_AFTER_DETECT = "delay_after_detect"
+CONF_DELAY_AFTER_DISAPPEAR = "delay_after_disappear"
+CONF_DETECTION_SEGMENTS = "detection_segments"
+CONF_OUTPUT_LATENCY = "output_latency"
+CONF_FACTORY_RESET = "factory_reset"
+CONF_SENSITIVITY = "sensitivity"
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(DfrobotSen0395Component),
+        }
+    ).extend(uart.UART_DEVICE_SCHEMA)
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
+
+
+@automation.register_action(
+    "dfrobot_sen0395.reset",
+    DfrobotSen0395ResetAction,
+    maybe_simple_id(
+        {
+            cv.GenerateID(): cv.use_id(DfrobotSen0395Component),
+        }
+    ),
+)
+async def dfrobot_sen0395_reset_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+
+    return var
+
+
+def range_segment_list(input):
+    """Validate input is a list of ranges which can be used to configure the dfrobot mmwave radar
+
+    A list of segments should be provided. A minimum of one segment is required and a maximum of
+    four segments is allowed. A segment describes a range of distances. E.g. from 0mm to 1m.
+    The distances need to be defined in an ascending order and they cannot contain / intersect
+    each other.
+    """
+
+    # Flatten input to one dimensional list
+    flat_list = []
+    if isinstance(input, list):
+        for list_item in input:
+            if isinstance(list_item, list):
+                for item in list_item:
+                    flat_list.append(item)
+            else:
+                flat_list.append(list_item)
+    else:
+        flat_list.append(input)
+
+    input = flat_list
+
+    if len(input) < 2:
+        raise cv.Invalid(
+            "At least two values need to be specified (start + stop distances)"
+        )
+    if len(input) % 2 != 0:
+        raise cv.Invalid(
+            "An even number of arguments must be specified (pairs of min + max)"
+        )
+    if len(input) > 8:
+        raise cv.Invalid(
+            "Maximum four segments can be specified (8 values: 4 * min + max)"
+        )
+
+    largest_distance = -1
+    for distance in input:
+        if isinstance(distance, core.Lambda):
+            continue
+        m = cv.distance(distance)
+        if m > 9:
+            raise cv.Invalid("Maximum distance is 9m")
+        if m < 0:
+            raise cv.Invalid("Minimum distance is 0m")
+        if m <= largest_distance:
+            raise cv.Invalid(
+                "Distances must be delared from small to large "
+                "and they cannot contain each other"
+            )
+        largest_distance = m
+        # Replace distance object with meters float
+        input[input.index(distance)] = m
+
+    return input
+
+
+MMWAVE_SETTINGS_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(): cv.use_id(DfrobotSen0395Component),
+        cv.Optional(CONF_FACTORY_RESET): cv.templatable(cv.boolean),
+        cv.Optional(CONF_DETECTION_SEGMENTS): range_segment_list,
+        cv.Optional(CONF_OUTPUT_LATENCY): {
+            cv.Required(CONF_DELAY_AFTER_DETECT): cv.templatable(
+                cv.All(
+                    cv.positive_time_period,
+                    cv.Range(max=core.TimePeriod(seconds=1638.375)),
+                )
+            ),
+            cv.Required(CONF_DELAY_AFTER_DISAPPEAR): cv.templatable(
+                cv.All(
+                    cv.positive_time_period,
+                    cv.Range(max=core.TimePeriod(seconds=1638.375)),
+                )
+            ),
+        },
+        cv.Optional(CONF_SENSITIVITY): cv.templatable(cv.int_range(min=0, max=9)),
+    }
+).add_extra(
+    cv.has_at_least_one_key(
+        CONF_FACTORY_RESET,
+        CONF_DETECTION_SEGMENTS,
+        CONF_OUTPUT_LATENCY,
+        CONF_SENSITIVITY,
+    )
+)
+
+
+@automation.register_action(
+    "dfrobot_sen0395.settings",
+    DfrobotSen0395SettingsAction,
+    MMWAVE_SETTINGS_SCHEMA,
+)
+async def dfrobot_sen0395_settings_to_code(config, action_id, template_arg, args):
+    var = cg.new_Pvariable(action_id, template_arg)
+    await cg.register_parented(var, config[CONF_ID])
+
+    if factory_reset_config := config.get(CONF_FACTORY_RESET):
+        template_ = await cg.templatable(factory_reset_config, args, int)
+        cg.add(var.set_factory_reset(template_))
+
+    if CONF_DETECTION_SEGMENTS in config:
+        segments = config[CONF_DETECTION_SEGMENTS]
+
+        if len(segments) >= 2:
+            template_ = await cg.templatable(segments[0], args, float)
+            cg.add(var.set_det_min1(template_))
+            template_ = await cg.templatable(segments[1], args, float)
+            cg.add(var.set_det_max1(template_))
+        if len(segments) >= 4:
+            template_ = await cg.templatable(segments[2], args, float)
+            cg.add(var.set_det_min2(template_))
+            template_ = await cg.templatable(segments[3], args, float)
+            cg.add(var.set_det_max2(template_))
+        if len(segments) >= 6:
+            template_ = await cg.templatable(segments[4], args, float)
+            cg.add(var.set_det_min3(template_))
+            template_ = await cg.templatable(segments[5], args, float)
+            cg.add(var.set_det_max3(template_))
+        if len(segments) >= 8:
+            template_ = await cg.templatable(segments[6], args, float)
+            cg.add(var.set_det_min4(template_))
+            template_ = await cg.templatable(segments[7], args, float)
+            cg.add(var.set_det_max4(template_))
+    if CONF_OUTPUT_LATENCY in config:
+        template_ = await cg.templatable(
+            config[CONF_OUTPUT_LATENCY][CONF_DELAY_AFTER_DETECT], args, float
+        )
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds / 1000
+        cg.add(var.set_delay_after_detect(template_))
+
+        template_ = await cg.templatable(
+            config[CONF_OUTPUT_LATENCY][CONF_DELAY_AFTER_DISAPPEAR], args, float
+        )
+        if isinstance(template_, cv.TimePeriod):
+            template_ = template_.total_milliseconds / 1000
+        cg.add(var.set_delay_after_disappear(template_))
+    if CONF_SENSITIVITY in config:
+        template_ = await cg.templatable(config[CONF_SENSITIVITY], args, int)
+        cg.add(var.set_sensitivity(template_))
+
+    return var
diff --git a/esphome/components/dfrobot_sen0395/automation.h b/esphome/components/dfrobot_sen0395/automation.h
new file mode 100644
index 0000000000..1f942c02e4
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/automation.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+
+#include "dfrobot_sen0395.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+template<typename... Ts>
+class DfrobotSen0395ResetAction : public Action<Ts...>, public Parented<DfrobotSen0395Component> {
+ public:
+  void play(Ts... x) { this->parent_->enqueue(make_unique<ResetSystemCommand>()); }
+};
+
+template<typename... Ts>
+class DfrobotSen0395SettingsAction : public Action<Ts...>, public Parented<DfrobotSen0395Component> {
+ public:
+  TEMPLATABLE_VALUE(int8_t, factory_reset)
+  TEMPLATABLE_VALUE(int8_t, start_after_power_on)
+  TEMPLATABLE_VALUE(int8_t, turn_on_led)
+  TEMPLATABLE_VALUE(int8_t, presence_via_uart)
+  TEMPLATABLE_VALUE(int8_t, sensitivity)
+  TEMPLATABLE_VALUE(float, delay_after_detect)
+  TEMPLATABLE_VALUE(float, delay_after_disappear)
+  TEMPLATABLE_VALUE(float, det_min1)
+  TEMPLATABLE_VALUE(float, det_max1)
+  TEMPLATABLE_VALUE(float, det_min2)
+  TEMPLATABLE_VALUE(float, det_max2)
+  TEMPLATABLE_VALUE(float, det_min3)
+  TEMPLATABLE_VALUE(float, det_max3)
+  TEMPLATABLE_VALUE(float, det_min4)
+  TEMPLATABLE_VALUE(float, det_max4)
+
+  void play(Ts... x) {
+    this->parent_->enqueue(make_unique<PowerCommand>(0));
+    if (this->factory_reset_.has_value() && this->factory_reset_.value(x...) == true) {
+      this->parent_->enqueue(make_unique<FactoryResetCommand>());
+    }
+    if (this->det_min1_.has_value() && this->det_max1_.has_value()) {
+      if (this->det_min1_.value() >= 0 && this->det_max1_.value() >= 0) {
+        this->parent_->enqueue(make_unique<DetRangeCfgCommand>(
+            this->det_min1_.value_or(-1), this->det_max1_.value_or(-1), this->det_min2_.value_or(-1),
+            this->det_max2_.value_or(-1), this->det_min3_.value_or(-1), this->det_max3_.value_or(-1),
+            this->det_min4_.value_or(-1), this->det_max4_.value_or(-1)));
+      }
+    }
+    if (this->delay_after_detect_.has_value() && this->delay_after_disappear_.has_value()) {
+      float detect = this->delay_after_detect_.value(x...);
+      float disappear = this->delay_after_disappear_.value(x...);
+      if (detect >= 0 && disappear >= 0) {
+        this->parent_->enqueue(make_unique<OutputLatencyCommand>(detect, disappear));
+      }
+    }
+    if (this->start_after_power_on_.has_value()) {
+      int8_t val = this->start_after_power_on_.value(x...);
+      if (val >= 0) {
+        this->parent_->enqueue(make_unique<SensorCfgStartCommand>(val));
+      }
+    }
+    if (this->turn_on_led_.has_value()) {
+      int8_t val = this->turn_on_led_.value(x...);
+      if (val >= 0) {
+        this->parent_->enqueue(make_unique<LedModeCommand>(val));
+      }
+    }
+    if (this->presence_via_uart_.has_value()) {
+      int8_t val = this->presence_via_uart_.value(x...);
+      if (val >= 0) {
+        this->parent_->enqueue(make_unique<UartOutputCommand>(val));
+      }
+    }
+    if (this->sensitivity_.has_value()) {
+      int8_t val = this->sensitivity_.value(x...);
+      if (val >= 0) {
+        if (val > 9) {
+          val = 9;
+        }
+        this->parent_->enqueue(make_unique<SensitivityCommand>(val));
+      }
+    }
+    this->parent_->enqueue(make_unique<SaveCfgCommand>());
+    this->parent_->enqueue(make_unique<PowerCommand>(1));
+  }
+};
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/binary_sensor.py b/esphome/components/dfrobot_sen0395/binary_sensor.py
new file mode 100644
index 0000000000..2fd0510476
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/binary_sensor.py
@@ -0,0 +1,22 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import DEVICE_CLASS_MOTION
+from . import CONF_DFROBOT_SEN0395_ID, DfrobotSen0395Component
+
+DEPENDENCIES = ["dfrobot_sen0395"]
+
+CONFIG_SCHEMA = binary_sensor.binary_sensor_schema(
+    device_class=DEVICE_CLASS_MOTION
+).extend(
+    {
+        cv.GenerateID(CONF_DFROBOT_SEN0395_ID): cv.use_id(DfrobotSen0395Component),
+    }
+)
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_DFROBOT_SEN0395_ID])
+    binary_sens = await binary_sensor.new_binary_sensor(config)
+
+    cg.add(parent.set_detected_binary_sensor(binary_sens))
diff --git a/esphome/components/dfrobot_sen0395/commands.cpp b/esphome/components/dfrobot_sen0395/commands.cpp
new file mode 100644
index 0000000000..3a89b2b71e
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/commands.cpp
@@ -0,0 +1,329 @@
+#include "commands.h"
+
+#include "esphome/core/log.h"
+
+#include "dfrobot_sen0395.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+static const char *const TAG = "dfrobot_sen0395.commands";
+
+uint8_t Command::execute(DfrobotSen0395Component *parent) {
+  this->parent_ = parent;
+  if (this->cmd_sent_) {
+    if (this->parent_->read_message_()) {
+      std::string message(this->parent_->read_buffer_);
+      if (message.rfind("is not recognized as a CLI command") != std::string::npos) {
+        ESP_LOGD(TAG, "Command not recognized properly by sensor");
+        if (this->retries_left_ > 0) {
+          this->retries_left_ -= 1;
+          this->cmd_sent_ = false;
+          ESP_LOGD(TAG, "Retrying...");
+          return 0;
+        } else {
+          this->parent_->find_prompt_();
+          return 1;  // Command done
+        }
+      }
+      uint8_t rc = on_message(message);
+      if (rc == 2) {
+        if (this->retries_left_ > 0) {
+          this->retries_left_ -= 1;
+          this->cmd_sent_ = false;
+          ESP_LOGD(TAG, "Retrying...");
+          return 0;
+        } else {
+          this->parent_->find_prompt_();
+          return 1;  // Command done
+        }
+      } else if (rc == 0) {
+        return 0;
+      } else {
+        this->parent_->find_prompt_();
+        return 1;
+      }
+    }
+    if (millis() - this->parent_->ts_last_cmd_sent_ > this->timeout_ms_) {
+      ESP_LOGD(TAG, "Command timeout");
+      if (this->retries_left_ > 0) {
+        this->retries_left_ -= 1;
+        this->cmd_sent_ = false;
+        ESP_LOGD(TAG, "Retrying...");
+      } else {
+        return 1;  // Command done
+      }
+    }
+  } else if (this->parent_->send_cmd_(this->cmd_.c_str(), this->cmd_duration_ms_)) {
+    this->cmd_sent_ = true;
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t ReadStateCommand::execute(DfrobotSen0395Component *parent) {
+  this->parent_ = parent;
+  if (this->parent_->read_message_()) {
+    std::string message(this->parent_->read_buffer_);
+    if (message.rfind("$JYBSS,0, , , *") != std::string::npos) {
+      this->parent_->set_detected_(false);
+      this->parent_->set_active(true);
+      return 1;  // Command done
+    } else if (message.rfind("$JYBSS,1, , , *") != std::string::npos) {
+      this->parent_->set_detected_(true);
+      this->parent_->set_active(true);
+      return 1;  // Command done
+    }
+  }
+  if (millis() - this->parent_->ts_last_cmd_sent_ > this->timeout_ms_) {
+    return 1;  // Command done, timeout
+  }
+  return 0;  // Command not done yet.
+}
+
+uint8_t ReadStateCommand::on_message(std::string &message) { return 1; }
+
+uint8_t PowerCommand::on_message(std::string &message) {
+  if (message == "sensor stopped already") {
+    this->parent_->set_active(false);
+    ESP_LOGI(TAG, "Stopped sensor (already stopped)");
+    return 1;  // Command done
+  } else if (message == "sensor started already") {
+    this->parent_->set_active(true);
+    ESP_LOGI(TAG, "Started sensor (already started)");
+    return 1;  // Command done
+  } else if (message == "new parameter isn't save, can't startSensor") {
+    this->parent_->set_active(false);
+    ESP_LOGE(TAG, "Can't start sensor! (Use SaveCfgCommand to save config first)");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    this->parent_->set_active(this->power_on_);
+    if (this->power_on_) {
+      ESP_LOGI(TAG, "Started sensor");
+    } else {
+      ESP_LOGI(TAG, "Stopped sensor");
+    }
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet.
+}
+
+DetRangeCfgCommand::DetRangeCfgCommand(float min1, float max1, float min2, float max2, float min3, float max3,
+                                       float min4, float max4) {
+  // TODO: Print warning when values are rounded
+  if (min1 < 0 || max1 < 0) {
+    this->min1_ = min1 = 0;
+    this->max1_ = max1 = 0;
+    this->min2_ = min2 = this->max2_ = max2 = this->min3_ = min3 = this->max3_ = max3 = this->min4_ = min4 =
+        this->max4_ = max4 = -1;
+
+    ESP_LOGW(TAG, "DetRangeCfgCommand invalid input parameters. Using range config 0 0.");
+
+    this->cmd_ = "detRangeCfg -1 0 0";
+  } else if (min2 < 0 || max2 < 0) {
+    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
+    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
+    this->min2_ = min2 = this->max2_ = max2 = this->min3_ = min3 = this->max3_ = max3 = this->min4_ = min4 =
+        this->max4_ = max4 = -1;
+
+    this->cmd_ = str_sprintf("detRangeCfg -1 %.0f %.0f", min1 / 0.15, max1 / 0.15);
+  } else if (min3 < 0 || max3 < 0) {
+    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
+    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
+    this->min2_ = min2 = round(min2 / 0.15) * 0.15;
+    this->max2_ = max2 = round(max2 / 0.15) * 0.15;
+    this->min3_ = min3 = this->max3_ = max3 = this->min4_ = min4 = this->max4_ = max4 = -1;
+
+    this->cmd_ = str_sprintf("detRangeCfg -1 %.0f %.0f %.0f %.0f", min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15);
+  } else if (min4 < 0 || max4 < 0) {
+    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
+    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
+    this->min2_ = min2 = round(min2 / 0.15) * 0.15;
+    this->max2_ = max2 = round(max2 / 0.15) * 0.15;
+    this->min3_ = min3 = round(min3 / 0.15) * 0.15;
+    this->max3_ = max3 = round(max3 / 0.15) * 0.15;
+    this->min4_ = min4 = this->max4_ = max4 = -1;
+
+    this->cmd_ = str_sprintf("detRangeCfg -1 "
+                             "%.0f %.0f %.0f %.0f %.0f %.0f",
+                             min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15, min3 / 0.15, max3 / 0.15);
+  } else {
+    this->min1_ = min1 = round(min1 / 0.15) * 0.15;
+    this->max1_ = max1 = round(max1 / 0.15) * 0.15;
+    this->min2_ = min2 = round(min2 / 0.15) * 0.15;
+    this->max2_ = max2 = round(max2 / 0.15) * 0.15;
+    this->min3_ = min3 = round(min3 / 0.15) * 0.15;
+    this->max3_ = max3 = round(max3 / 0.15) * 0.15;
+    this->min4_ = min4 = round(min4 / 0.15) * 0.15;
+    this->max4_ = max4 = round(max4 / 0.15) * 0.15;
+
+    this->cmd_ = str_sprintf("detRangeCfg -1 "
+                             "%.0f %.0f %.0f %.0f %.0f %.0f %.0f %.0f",
+                             min1 / 0.15, max1 / 0.15, min2 / 0.15, max2 / 0.15, min3 / 0.15, max3 / 0.15, min4 / 0.15,
+                             max4 / 0.15);
+  }
+
+  this->min1_ = min1;
+  this->max1_ = max1;
+  this->min2_ = min2;
+  this->max2_ = max2;
+  this->min3_ = min3;
+  this->max3_ = max3;
+  this->min4_ = min4;
+  this->max4_ = max4;
+};
+
+uint8_t DetRangeCfgCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot configure range config. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Updated detection area config:");
+    ESP_LOGI(TAG, "Detection area 1 from %.02fm to %.02fm.", this->min1_, this->max1_);
+    if (this->min2_ >= 0 && this->max2_ >= 0) {
+      ESP_LOGI(TAG, "Detection area 2 from %.02fm to %.02fm.", this->min2_, this->max2_);
+    }
+    if (this->min3_ >= 0 && this->max3_ >= 0) {
+      ESP_LOGI(TAG, "Detection area 3 from %.02fm to %.02fm.", this->min3_, this->max3_);
+    }
+    if (this->min4_ >= 0 && this->max4_ >= 0) {
+      ESP_LOGI(TAG, "Detection area 4 from %.02fm to %.02fm.", this->min4_, this->max4_);
+    }
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet.
+}
+
+OutputLatencyCommand::OutputLatencyCommand(float delay_after_detection, float delay_after_disappear) {
+  delay_after_detection = round(delay_after_detection / 0.025) * 0.025;
+  delay_after_disappear = round(delay_after_disappear / 0.025) * 0.025;
+  if (delay_after_detection < 0)
+    delay_after_detection = 0;
+  if (delay_after_detection > 1638.375)
+    delay_after_detection = 1638.375;
+  if (delay_after_disappear < 0)
+    delay_after_disappear = 0;
+  if (delay_after_disappear > 1638.375)
+    delay_after_disappear = 1638.375;
+
+  this->delay_after_detection_ = delay_after_detection;
+  this->delay_after_disappear_ = delay_after_disappear;
+
+  this->cmd_ = str_sprintf("outputLatency -1 %.0f %.0f", delay_after_detection / 0.025, delay_after_disappear / 0.025);
+};
+
+uint8_t OutputLatencyCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot configure output latency. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Updated output latency config:");
+    ESP_LOGI(TAG, "Signal that someone was detected is delayed by %.02fs.", this->delay_after_detection_);
+    ESP_LOGI(TAG, "Signal that nobody is detected anymore is delayed by %.02fs.", this->delay_after_disappear_);
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t SensorCfgStartCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot configure sensor startup behavior. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Updated sensor startup behavior:");
+    if (startup_mode_) {
+      this->parent_->set_start_after_boot(true);
+      ESP_LOGI(TAG, "Sensor will start automatically after power-on.");
+    } else {
+      this->parent_->set_start_after_boot(false);
+      ESP_LOGI(TAG, "Sensor needs to be started manually after power-on.");
+    }
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t FactoryResetCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot factory reset. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Sensor factory reset done.");
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t ResetSystemCommand::on_message(std::string &message) {
+  if (message == "leapMMW:/>") {
+    ESP_LOGI(TAG, "Restarted sensor.");
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t SaveCfgCommand::on_message(std::string &message) {
+  if (message == "no parameter has changed") {
+    ESP_LOGI(TAG, "Not saving config (no parameter changed).");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Saved config. Saving a lot may damage the sensor.");
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t LedModeCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot set led mode. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Set led mode done.");
+    if (this->active_) {
+      this->parent_->set_led_active(true);
+      ESP_LOGI(TAG, "Sensor LED will blink.");
+    } else {
+      this->parent_->set_led_active(false);
+      ESP_LOGI(TAG, "Turned off LED.");
+    }
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t UartOutputCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot set uart output mode. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Set uart mode done.");
+    if (this->active_) {
+      this->parent_->set_uart_presence_active(true);
+      ESP_LOGI(TAG, "Presence information is sent via UART and GPIO.");
+    } else {
+      this->parent_->set_uart_presence_active(false);
+      ESP_LOGI(TAG, "Presence information is only sent via GPIO.");
+    }
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+uint8_t SensitivityCommand::on_message(std::string &message) {
+  if (message == "sensor is not stopped") {
+    ESP_LOGE(TAG, "Cannot set sensitivity. Sensor is not stopped!");
+    return 1;  // Command done
+  } else if (message == "Done") {
+    ESP_LOGI(TAG, "Set sensitivity done. Set to value %d.", this->sensitivity_);
+    ESP_LOGD(TAG, "Used command: %s", this->cmd_.c_str());
+    return 1;  // Command done
+  }
+  return 0;  // Command not done yet
+}
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/commands.h b/esphome/components/dfrobot_sen0395/commands.h
new file mode 100644
index 0000000000..7426d9732a
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/commands.h
@@ -0,0 +1,156 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+class DfrobotSen0395Component;
+
+// Use command queue and time stamps to avoid blocking.
+// When component has run time, check if minimum time (1s) between
+// commands has passed. After that run a command from the queue.
+class Command {
+ public:
+  virtual ~Command() = default;
+  virtual uint8_t execute(DfrobotSen0395Component *parent);
+  virtual uint8_t on_message(std::string &message) = 0;
+
+ protected:
+  DfrobotSen0395Component *parent_{nullptr};
+  std::string cmd_;
+  bool cmd_sent_{false};
+  int8_t retries_left_{2};
+  uint32_t cmd_duration_ms_{1000};
+  uint32_t timeout_ms_{1500};
+};
+
+class ReadStateCommand : public Command {
+ public:
+  uint8_t execute(DfrobotSen0395Component *parent) override;
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  uint32_t timeout_ms_{500};
+};
+
+class PowerCommand : public Command {
+ public:
+  PowerCommand(bool power_on) : power_on_(power_on) {
+    if (power_on) {
+      cmd_ = "sensorStart";
+    } else {
+      cmd_ = "sensorStop";
+    }
+  };
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  bool power_on_;
+};
+
+class DetRangeCfgCommand : public Command {
+ public:
+  DetRangeCfgCommand(float min1, float max1, float min2, float max2, float min3, float max3, float min4, float max4);
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  float min1_, max1_, min2_, max2_, min3_, max3_, min4_, max4_;
+  // TODO: Set min max values in component, so they can be published as sensor.
+};
+
+class OutputLatencyCommand : public Command {
+ public:
+  OutputLatencyCommand(float delay_after_detection, float delay_after_disappear);
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  float delay_after_detection_;
+  float delay_after_disappear_;
+};
+
+class SensorCfgStartCommand : public Command {
+ public:
+  SensorCfgStartCommand(bool startup_mode) : startup_mode_(startup_mode) {
+    char tmp_cmd[20] = {0};
+    sprintf(tmp_cmd, "sensorCfgStart %d", startup_mode);
+    cmd_ = std::string(tmp_cmd);
+  }
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  bool startup_mode_;
+};
+
+class FactoryResetCommand : public Command {
+ public:
+  FactoryResetCommand() { cmd_ = "factoryReset 0x45670123 0xCDEF89AB 0x956128C6 0xDF54AC89"; };
+  uint8_t on_message(std::string &message) override;
+};
+
+class ResetSystemCommand : public Command {
+ public:
+  ResetSystemCommand() { cmd_ = "resetSystem"; }
+  uint8_t on_message(std::string &message) override;
+};
+
+class SaveCfgCommand : public Command {
+ public:
+  SaveCfgCommand() { cmd_ = "saveCfg 0x45670123 0xCDEF89AB 0x956128C6 0xDF54AC89"; }
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  uint32_t cmd_duration_ms_{3000};
+  uint32_t timeout_ms_{3500};
+};
+
+class LedModeCommand : public Command {
+ public:
+  LedModeCommand(bool active) : active_(active) {
+    if (active) {
+      cmd_ = "setLedMode 1 0";
+    } else {
+      cmd_ = "setLedMode 1 1";
+    }
+  };
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  bool active_;
+};
+
+class UartOutputCommand : public Command {
+ public:
+  UartOutputCommand(bool active) : active_(active) {
+    if (active) {
+      cmd_ = "setUartOutput 1 1";
+    } else {
+      cmd_ = "setUartOutput 1 0";
+    }
+  };
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  bool active_;
+};
+
+class SensitivityCommand : public Command {
+ public:
+  SensitivityCommand(uint8_t sensitivity) : sensitivity_(sensitivity) {
+    if (sensitivity > 9)
+      sensitivity_ = sensitivity = 9;
+    char tmp_cmd[20] = {0};
+    sprintf(tmp_cmd, "setSensitivity %d", sensitivity);
+    cmd_ = std::string(tmp_cmd);
+  };
+  uint8_t on_message(std::string &message) override;
+
+ protected:
+  uint8_t sensitivity_;
+};
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/dfrobot_sen0395.cpp b/esphome/components/dfrobot_sen0395/dfrobot_sen0395.cpp
new file mode 100644
index 0000000000..f8ef6c7138
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/dfrobot_sen0395.cpp
@@ -0,0 +1,142 @@
+#include "dfrobot_sen0395.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+static const char *const TAG = "dfrobot_sen0395";
+const char ASCII_CR = 0x0D;
+const char ASCII_LF = 0x0A;
+
+void DfrobotSen0395Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "Dfrobot Mmwave Radar:");
+#ifdef USE_BINARY_SENSOR
+  LOG_BINARY_SENSOR("  ", "Registered", this->detected_binary_sensor_);
+#endif
+#ifdef USE_SWITCH
+  LOG_SWITCH("  ", "Sensor Active Switch", this->sensor_active_switch_);
+  LOG_SWITCH("  ", "Turn on LED Switch", this->turn_on_led_switch_);
+  LOG_SWITCH("  ", "Presence via UART Switch", this->presence_via_uart_switch_);
+  LOG_SWITCH("  ", "Start after Boot Switch", this->start_after_boot_switch_);
+#endif
+}
+
+void DfrobotSen0395Component::loop() {
+  if (cmd_queue_.is_empty()) {
+    // Command queue empty. Read sensor state.
+    cmd_queue_.enqueue(make_unique<ReadStateCommand>());
+  }
+
+  // Commands are non-blocking and need to be called repeatedly.
+  if (cmd_queue_.process(this)) {
+    // Dequeue if command is done
+    cmd_queue_.dequeue();
+  }
+}
+
+int8_t DfrobotSen0395Component::enqueue(std::unique_ptr<Command> cmd) {
+  return cmd_queue_.enqueue(std::move(cmd));  // Transfer ownership using std::move
+}
+
+uint8_t DfrobotSen0395Component::read_message_() {
+  while (this->available()) {
+    uint8_t byte;
+    this->read_byte(&byte);
+
+    if (this->read_pos_ == MMWAVE_READ_BUFFER_LENGTH)
+      this->read_pos_ = 0;
+
+    ESP_LOGVV(TAG, "Buffer pos: %u %d", this->read_pos_, byte);
+
+    if (byte == ASCII_CR)
+      continue;
+    if (byte >= 0x7F)
+      byte = '?';  // needs to be valid utf8 string for log functions.
+    this->read_buffer_[this->read_pos_] = byte;
+
+    if (this->read_pos_ == 9 && byte == '>')
+      this->read_buffer_[++this->read_pos_] = ASCII_LF;
+
+    if (this->read_buffer_[this->read_pos_] == ASCII_LF) {
+      this->read_buffer_[this->read_pos_] = 0;
+      this->read_pos_ = 0;
+      ESP_LOGV(TAG, "Message: %s", this->read_buffer_);
+      return 1;  // Full message in buffer
+    } else {
+      this->read_pos_++;
+    }
+  }
+  return 0;  // No full message yet
+}
+
+uint8_t DfrobotSen0395Component::find_prompt_() {
+  if (this->read_message_()) {
+    std::string message(this->read_buffer_);
+    if (message.rfind("leapMMW:/>") != std::string::npos) {
+      return 1;  // Prompt found
+    }
+  }
+  return 0;  // Not found yet
+}
+
+uint8_t DfrobotSen0395Component::send_cmd_(const char *cmd, uint32_t duration) {
+  // The interval between two commands must be larger than the specified duration (in ms).
+  if (millis() - ts_last_cmd_sent_ > duration) {
+    this->write_str(cmd);
+    ts_last_cmd_sent_ = millis();
+    return 1;  // Command sent
+  }
+  // Could not send command yet as command duration did not fully pass yet.
+  return 0;
+}
+
+void DfrobotSen0395Component::set_detected_(bool detected) {
+  this->detected_ = detected;
+#ifdef USE_BINARY_SENSOR
+  if (this->detected_binary_sensor_ != nullptr)
+    this->detected_binary_sensor_->publish_state(detected);
+#endif
+}
+
+int8_t CircularCommandQueue::enqueue(std::unique_ptr<Command> cmd) {
+  if (this->is_full()) {
+    ESP_LOGE(TAG, "Command queue is full");
+    return -1;
+  } else if (this->is_empty())
+    front_++;
+  rear_ = (rear_ + 1) % COMMAND_QUEUE_SIZE;
+  commands_[rear_] = std::move(cmd);  // Transfer ownership using std::move
+  return 1;
+}
+
+std::unique_ptr<Command> CircularCommandQueue::dequeue() {
+  if (this->is_empty())
+    return nullptr;
+  std::unique_ptr<Command> dequeued_cmd = std::move(commands_[front_]);
+  if (front_ == rear_) {
+    front_ = -1;
+    rear_ = -1;
+  } else
+    front_ = (front_ + 1) % COMMAND_QUEUE_SIZE;
+
+  return dequeued_cmd;
+}
+
+bool CircularCommandQueue::is_empty() { return front_ == -1; }
+
+bool CircularCommandQueue::is_full() { return (rear_ + 1) % COMMAND_QUEUE_SIZE == front_; }
+
+// Run execute method of first in line command.
+// Execute is non-blocking and has to be called until it returns 1.
+uint8_t CircularCommandQueue::process(DfrobotSen0395Component *parent) {
+  if (!is_empty()) {
+    return commands_[front_]->execute(parent);
+  } else {
+    return 1;
+  }
+}
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/dfrobot_sen0395.h b/esphome/components/dfrobot_sen0395/dfrobot_sen0395.h
new file mode 100644
index 0000000000..d3b2ecedc3
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/dfrobot_sen0395.h
@@ -0,0 +1,125 @@
+#pragma once
+
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+
+#ifdef USE_BINARY_SENSOR
+#include "esphome/components/binary_sensor/binary_sensor.h"
+#endif
+#ifdef USE_SWITCH
+#include "esphome/components/switch/switch.h"
+#endif
+
+#include "commands.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+const uint8_t MMWAVE_READ_BUFFER_LENGTH = 255;
+
+// forward declaration due to circular dependency
+class DfrobotSen0395Component;
+
+static const uint8_t COMMAND_QUEUE_SIZE = 20;
+
+class CircularCommandQueue {
+ public:
+  int8_t enqueue(std::unique_ptr<Command> cmd);
+  std::unique_ptr<Command> dequeue();
+  bool is_empty();
+  bool is_full();
+  uint8_t process(DfrobotSen0395Component *parent);
+
+ protected:
+  int front_{-1};
+  int rear_{-1};
+  std::unique_ptr<Command> commands_[COMMAND_QUEUE_SIZE];
+};
+
+class DfrobotSen0395Component : public uart::UARTDevice, public Component {
+#ifdef USE_SWITCH
+  SUB_SWITCH(sensor_active)
+  SUB_SWITCH(turn_on_led)
+  SUB_SWITCH(presence_via_uart)
+  SUB_SWITCH(start_after_boot)
+#endif
+
+ public:
+  void dump_config() override;
+  void loop() override;
+  void set_active(bool active) {
+    if (active != active_) {
+#ifdef USE_SWITCH
+      if (this->sensor_active_switch_ != nullptr)
+        this->sensor_active_switch_->publish_state(active);
+#endif
+      active_ = active;
+    }
+  }
+  bool is_active() { return active_; }
+
+  void set_led_active(bool active) {
+    if (led_active_ != active) {
+#ifdef USE_SWITCH
+      if (this->turn_on_led_switch_ != nullptr)
+        this->turn_on_led_switch_->publish_state(active);
+#endif
+      led_active_ = active;
+    }
+  }
+  bool is_led_active() { return led_active_; }
+
+  void set_uart_presence_active(bool active) {
+    uart_presence_active_ = active;
+#ifdef USE_SWITCH
+    if (this->presence_via_uart_switch_ != nullptr)
+      this->presence_via_uart_switch_->publish_state(active);
+#endif
+  }
+  bool is_uart_presence_active() { return uart_presence_active_; }
+
+  void set_start_after_boot(bool start) {
+    start_after_boot_ = start;
+#ifdef USE_SWITCH
+    if (this->start_after_boot_switch_ != nullptr)
+      this->start_after_boot_switch_->publish_state(start);
+#endif
+  }
+  bool does_start_after_boot() { return start_after_boot_; }
+
+#ifdef USE_BINARY_SENSOR
+  void set_detected_binary_sensor(binary_sensor::BinarySensor *detected_binary_sensor) {
+    detected_binary_sensor_ = detected_binary_sensor;
+  }
+#endif
+
+  int8_t enqueue(std::unique_ptr<Command> cmd);
+
+ protected:
+#ifdef USE_BINARY_SENSOR
+  binary_sensor::BinarySensor *detected_binary_sensor_{nullptr};
+#endif
+
+  bool detected_{false};
+  bool active_{false};
+  bool led_active_{false};
+  bool uart_presence_active_{false};
+  bool start_after_boot_{false};
+  char read_buffer_[MMWAVE_READ_BUFFER_LENGTH];
+  size_t read_pos_{0};
+  CircularCommandQueue cmd_queue_;
+  uint32_t ts_last_cmd_sent_{0};
+
+  uint8_t read_message_();
+  uint8_t find_prompt_();
+  uint8_t send_cmd_(const char *cmd, uint32_t duration);
+
+  void set_detected_(bool detected);
+
+  friend class Command;
+  friend class ReadStateCommand;
+};
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/switch/__init__.py b/esphome/components/dfrobot_sen0395/switch/__init__.py
new file mode 100644
index 0000000000..b1c35d27ac
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/switch/__init__.py
@@ -0,0 +1,65 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import switch
+from esphome.const import ENTITY_CATEGORY_CONFIG, CONF_TYPE
+
+from .. import CONF_DFROBOT_SEN0395_ID, DfrobotSen0395Component
+
+
+DEPENDENCIES = ["dfrobot_sen0395"]
+
+dfrobot_sen0395_ns = cg.esphome_ns.namespace("dfrobot_sen0395")
+DfrobotSen0395Switch = dfrobot_sen0395_ns.class_(
+    "DfrobotSen0395Switch",
+    switch.Switch,
+    cg.Component,
+    cg.Parented.template(DfrobotSen0395Component),
+)
+
+Sen0395PowerSwitch = dfrobot_sen0395_ns.class_(
+    "Sen0395PowerSwitch", DfrobotSen0395Switch
+)
+Sen0395LedSwitch = dfrobot_sen0395_ns.class_("Sen0395LedSwitch", DfrobotSen0395Switch)
+Sen0395UartPresenceSwitch = dfrobot_sen0395_ns.class_(
+    "Sen0395UartPresenceSwitch", DfrobotSen0395Switch
+)
+Sen0395StartAfterBootSwitch = dfrobot_sen0395_ns.class_(
+    "Sen0395StartAfterBootSwitch", DfrobotSen0395Switch
+)
+
+_SWITCH_SCHEMA = (
+    switch.switch_schema(
+        entity_category=ENTITY_CATEGORY_CONFIG,
+    )
+    .extend(
+        {
+            cv.GenerateID(CONF_DFROBOT_SEN0395_ID): cv.use_id(DfrobotSen0395Component),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+CONFIG_SCHEMA = cv.typed_schema(
+    {
+        "sensor_active": _SWITCH_SCHEMA.extend(
+            {cv.GenerateID(): cv.declare_id(Sen0395PowerSwitch)}
+        ),
+        "turn_on_led": _SWITCH_SCHEMA.extend(
+            {cv.GenerateID(): cv.declare_id(Sen0395LedSwitch)}
+        ),
+        "presence_via_uart": _SWITCH_SCHEMA.extend(
+            {cv.GenerateID(): cv.declare_id(Sen0395UartPresenceSwitch)}
+        ),
+        "start_after_boot": _SWITCH_SCHEMA.extend(
+            {cv.GenerateID(): cv.declare_id(Sen0395StartAfterBootSwitch)}
+        ),
+    }
+)
+
+
+async def to_code(config):
+    parent = await cg.get_variable(config[CONF_DFROBOT_SEN0395_ID])
+    var = await switch.new_switch(config)
+    await cg.register_component(var, config)
+    await cg.register_parented(var, parent)
+    cg.add(getattr(parent, f"set_{config[CONF_TYPE]}_switch")(var))
diff --git a/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.cpp b/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.cpp
new file mode 100644
index 0000000000..ca72d94531
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.cpp
@@ -0,0 +1,48 @@
+#include "dfrobot_sen0395_switch.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+void Sen0395PowerSwitch::write_state(bool state) { this->parent_->enqueue(make_unique<PowerCommand>(state)); }
+
+void Sen0395LedSwitch::write_state(bool state) {
+  bool was_active = false;
+  if (this->parent_->is_active()) {
+    was_active = true;
+    this->parent_->enqueue(make_unique<PowerCommand>(false));
+  }
+  this->parent_->enqueue(make_unique<LedModeCommand>(state));
+  this->parent_->enqueue(make_unique<SaveCfgCommand>());
+  if (was_active) {
+    this->parent_->enqueue(make_unique<PowerCommand>(true));
+  }
+}
+
+void Sen0395UartPresenceSwitch::write_state(bool state) {
+  bool was_active = false;
+  if (this->parent_->is_active()) {
+    was_active = true;
+    this->parent_->enqueue(make_unique<PowerCommand>(false));
+  }
+  this->parent_->enqueue(make_unique<UartOutputCommand>(state));
+  this->parent_->enqueue(make_unique<SaveCfgCommand>());
+  if (was_active) {
+    this->parent_->enqueue(make_unique<PowerCommand>(true));
+  }
+}
+
+void Sen0395StartAfterBootSwitch::write_state(bool state) {
+  bool was_active = false;
+  if (this->parent_->is_active()) {
+    was_active = true;
+    this->parent_->enqueue(make_unique<PowerCommand>(false));
+  }
+  this->parent_->enqueue(make_unique<SensorCfgStartCommand>(state));
+  this->parent_->enqueue(make_unique<SaveCfgCommand>());
+  if (was_active) {
+    this->parent_->enqueue(make_unique<PowerCommand>(true));
+  }
+}
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.h b/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.h
new file mode 100644
index 0000000000..ab32d81dd8
--- /dev/null
+++ b/esphome/components/dfrobot_sen0395/switch/dfrobot_sen0395_switch.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "esphome/components/switch/switch.h"
+#include "esphome/core/component.h"
+
+#include "../dfrobot_sen0395.h"
+
+namespace esphome {
+namespace dfrobot_sen0395 {
+
+class DfrobotSen0395Switch : public switch_::Switch, public Component, public Parented<DfrobotSen0395Component> {};
+
+class Sen0395PowerSwitch : public DfrobotSen0395Switch {
+ public:
+  void write_state(bool state) override;
+};
+
+class Sen0395LedSwitch : public DfrobotSen0395Switch {
+ public:
+  void write_state(bool state) override;
+};
+
+class Sen0395UartPresenceSwitch : public DfrobotSen0395Switch {
+ public:
+  void write_state(bool state) override;
+};
+
+class Sen0395StartAfterBootSwitch : public DfrobotSen0395Switch {
+ public:
+  void write_state(bool state) override;
+};
+
+}  // namespace dfrobot_sen0395
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 0d95dd6cb8..462b1ec197 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -220,6 +220,10 @@ uart:
     baud_rate: 256000
     parity: NONE
     stop_bits: 1
+  - id: dfrobot_mmwave_uart
+    tx_pin: 14
+    rx_pin: 27
+    baud_rate: 115200
   - id: gcja5_uart
     rx_pin: GPIO10
     parity: EVEN
@@ -332,6 +336,10 @@ mcp23s17:
     cs_pin: GPIO12
     deviceaddress: 1
 
+dfrobot_sen0395:
+  - id: mmwave
+    uart_id: dfrobot_mmwave_uart
+
 sensor:
   - platform: pmwcs3
     i2c_id: i2c_bus
@@ -1816,6 +1824,9 @@ binary_sensor:
   - platform: qwiic_pir
     i2c_id: i2c_bus
     name: "Qwiic PIR Motion Sensor"
+  - platform: dfrobot_sen0395
+    id: mmwave_detected_uart
+    dfrobot_sen0395_id: mmwave
 
 pca9685:
   frequency: 500
@@ -2548,7 +2559,22 @@ switch:
     name: Haier
     turn_on_action:
       remote_transmitter.transmit_haier:
-        code: [0xA6, 0xDA, 0x00, 0x00, 0x40, 0x40, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x05]
+        code:
+          [
+            0xA6,
+            0xDA,
+            0x00,
+            0x00,
+            0x40,
+            0x40,
+            0x00,
+            0x80,
+            0x00,
+            0x00,
+            0x00,
+            0x00,
+            0x05,
+          ]
   - platform: template
     name: Living Room Lights
     id: livingroom_lights
@@ -3532,6 +3558,25 @@ button:
     name: Midea Power Inverse
     on_press:
       midea_ac.power_toggle:
+  - platform: template
+    name: Update Mmwave Sensor Settings
+    on_press:
+      - dfrobot_sen0395.settings:
+          id: mmwave
+          factory_reset: true
+          detection_segments:
+            - [0cm, 5m]
+            - 600cm
+            - !lambda |-
+              return 7;
+          output_latency:
+            delay_after_detect: 0s
+            delay_after_disappear: 0s
+          sensitivity: 6
+  - platform: template
+    name: Reset Mmwave Sensor
+    on_press:
+      - dfrobot_sen0395.reset:
   - platform: template
     name: Poller component suspend test
     on_press:

From c83cb30935b6bd1e9949c2aea88822ce16ec9e80 Mon Sep 17 00:00:00 2001
From: Samuel Sieb <samuel-github@sieb.net>
Date: Thu, 26 Oct 2023 22:01:18 -0700
Subject: [PATCH 076/131] refactor mcp4728 component (#5609)

Co-authored-by: Samuel Sieb <samuel@sieb.net>
---
 esphome/components/mcp4728/__init__.py        |  1 +
 .../{mcp4728_output.cpp => mcp4728.cpp}       |  9 +-----
 .../mcp4728/{mcp4728_output.h => mcp4728.h}   | 24 --------------
 .../mcp4728/{output.py => output/__init__.py} |  3 +-
 .../mcp4728/output/mcp4728_output.cpp         | 17 ++++++++++
 .../mcp4728/output/mcp4728_output.h           | 32 +++++++++++++++++++
 6 files changed, 52 insertions(+), 34 deletions(-)
 rename esphome/components/mcp4728/{mcp4728_output.cpp => mcp4728.cpp} (90%)
 rename esphome/components/mcp4728/{mcp4728_output.h => mcp4728.h} (69%)
 rename esphome/components/mcp4728/{output.py => output/__init__.py} (96%)
 create mode 100644 esphome/components/mcp4728/output/mcp4728_output.cpp
 create mode 100644 esphome/components/mcp4728/output/mcp4728_output.h

diff --git a/esphome/components/mcp4728/__init__.py b/esphome/components/mcp4728/__init__.py
index d130ceb738..a0702c415c 100644
--- a/esphome/components/mcp4728/__init__.py
+++ b/esphome/components/mcp4728/__init__.py
@@ -10,6 +10,7 @@ CONF_STORE_IN_EEPROM = "store_in_eeprom"
 
 mcp4728_ns = cg.esphome_ns.namespace("mcp4728")
 MCP4728Component = mcp4728_ns.class_("MCP4728Component", cg.Component, i2c.I2CDevice)
+CONF_MCP4728_ID = "mcp4728_id"
 
 CONFIG_SCHEMA = (
     cv.Schema(
diff --git a/esphome/components/mcp4728/mcp4728_output.cpp b/esphome/components/mcp4728/mcp4728.cpp
similarity index 90%
rename from esphome/components/mcp4728/mcp4728_output.cpp
rename to esphome/components/mcp4728/mcp4728.cpp
index d011967624..1a8568a21c 100644
--- a/esphome/components/mcp4728/mcp4728_output.cpp
+++ b/esphome/components/mcp4728/mcp4728.cpp
@@ -1,4 +1,4 @@
-#include "mcp4728_output.h"
+#include "mcp4728.h"
 
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
@@ -110,12 +110,5 @@ void MCP4728Component::select_gain_(MCP4728ChannelIdx channel, MCP4728Gain gain)
   this->update_ = true;
 }
 
-void MCP4728Channel::write_state(float state) {
-  const uint16_t max_duty = 4095;
-  const float duty_rounded = roundf(state * max_duty);
-  auto duty = static_cast<uint16_t>(duty_rounded);
-  this->parent_->set_channel_value_(this->channel_, duty);
-}
-
 }  // namespace mcp4728
 }  // namespace esphome
diff --git a/esphome/components/mcp4728/mcp4728_output.h b/esphome/components/mcp4728/mcp4728.h
similarity index 69%
rename from esphome/components/mcp4728/mcp4728_output.h
rename to esphome/components/mcp4728/mcp4728.h
index 55bcfdccb6..f2262f4a35 100644
--- a/esphome/components/mcp4728/mcp4728_output.h
+++ b/esphome/components/mcp4728/mcp4728.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include "esphome/core/component.h"
-#include "esphome/components/output/float_output.h"
 #include "esphome/components/i2c/i2c.h"
 
 namespace esphome {
@@ -64,28 +63,5 @@ class MCP4728Component : public Component, public i2c::I2CDevice {
   bool update_ = false;
 };
 
-class MCP4728Channel : public output::FloatOutput {
- public:
-  MCP4728Channel(MCP4728Component *parent, MCP4728ChannelIdx channel, MCP4728Vref vref, MCP4728Gain gain,
-                 MCP4728PwrDown pwrdown)
-      : parent_(parent), channel_(channel), vref_(vref), gain_(gain), pwrdown_(pwrdown) {
-    // update VREF
-    parent->select_vref_(channel, vref_);
-    // update PD
-    parent->select_power_down_(channel, pwrdown_);
-    // update GAIN
-    parent->select_gain_(channel, gain_);
-  }
-
- protected:
-  void write_state(float state) override;
-
-  MCP4728Component *parent_;
-  MCP4728ChannelIdx channel_;
-  MCP4728Vref vref_;
-  MCP4728Gain gain_;
-  MCP4728PwrDown pwrdown_;
-};
-
 }  // namespace mcp4728
 }  // namespace esphome
diff --git a/esphome/components/mcp4728/output.py b/esphome/components/mcp4728/output/__init__.py
similarity index 96%
rename from esphome/components/mcp4728/output.py
rename to esphome/components/mcp4728/output/__init__.py
index e0913ab98a..20b196ca2c 100644
--- a/esphome/components/mcp4728/output.py
+++ b/esphome/components/mcp4728/output/__init__.py
@@ -2,12 +2,11 @@ import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import output
 from esphome.const import CONF_CHANNEL, CONF_ID, CONF_GAIN
-from . import MCP4728Component, mcp4728_ns
+from .. import MCP4728Component, CONF_MCP4728_ID, mcp4728_ns
 
 DEPENDENCIES = ["mcp4728"]
 
 MCP4728Channel = mcp4728_ns.class_("MCP4728Channel", output.FloatOutput)
-CONF_MCP4728_ID = "mcp4728_id"
 CONF_VREF = "vref"
 CONF_POWER_DOWN = "power_down"
 
diff --git a/esphome/components/mcp4728/output/mcp4728_output.cpp b/esphome/components/mcp4728/output/mcp4728_output.cpp
new file mode 100644
index 0000000000..b587e8801b
--- /dev/null
+++ b/esphome/components/mcp4728/output/mcp4728_output.cpp
@@ -0,0 +1,17 @@
+#include "mcp4728_output.h"
+
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace mcp4728 {
+
+void MCP4728Channel::write_state(float state) {
+  const uint16_t max_duty = 4095;
+  const float duty_rounded = roundf(state * max_duty);
+  auto duty = static_cast<uint16_t>(duty_rounded);
+  this->parent_->set_channel_value_(this->channel_, duty);
+}
+
+}  // namespace mcp4728
+}  // namespace esphome
diff --git a/esphome/components/mcp4728/output/mcp4728_output.h b/esphome/components/mcp4728/output/mcp4728_output.h
new file mode 100644
index 0000000000..453d632f4c
--- /dev/null
+++ b/esphome/components/mcp4728/output/mcp4728_output.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "../mcp4728.h"
+#include "esphome/core/component.h"
+#include "esphome/components/output/float_output.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace mcp4728 {
+
+class MCP4728Channel : public output::FloatOutput {
+ public:
+  MCP4728Channel(MCP4728Component *parent, MCP4728ChannelIdx channel, MCP4728Vref vref, MCP4728Gain gain,
+                 MCP4728PwrDown pwrdown)
+      : parent_(parent), channel_(channel) {
+    // update VREF
+    parent->select_vref_(channel, vref);
+    // update PD
+    parent->select_power_down_(channel, pwrdown);
+    // update GAIN
+    parent->select_gain_(channel, gain);
+  }
+
+ protected:
+  void write_state(float state) override;
+
+  MCP4728Component *parent_;
+  MCP4728ChannelIdx channel_;
+};
+
+}  // namespace mcp4728
+}  // namespace esphome

From 563e15e8a7d0f86a73e0f7087c062dbe60faaca5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=2E=20=C3=81rkosi=20R=C3=B3bert?= <robreg@zsurob.hu>
Date: Fri, 27 Oct 2023 09:39:23 +0200
Subject: [PATCH 077/131] Fix HA error related to incorrect state class (#5605)

---
 esphome/components/vbus/sensor/__init__.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/esphome/components/vbus/sensor/__init__.py b/esphome/components/vbus/sensor/__init__.py
index 2ad9da424e..2b89da6d32 100644
--- a/esphome/components/vbus/sensor/__init__.py
+++ b/esphome/components/vbus/sensor/__init__.py
@@ -22,6 +22,7 @@ from esphome.const import (
     ICON_THERMOMETER,
     ICON_TIMER,
     STATE_CLASS_MEASUREMENT,
+    STATE_CLASS_TOTAL_INCREASING,
     UNIT_CELSIUS,
     UNIT_HOUR,
     UNIT_MINUTE,
@@ -128,7 +129,7 @@ CONFIG_SCHEMA = cv.typed_schema(
                     icon=ICON_RADIATOR,
                     accuracy_decimals=0,
                     device_class=DEVICE_CLASS_ENERGY,
-                    state_class=STATE_CLASS_MEASUREMENT,
+                    state_class=STATE_CLASS_TOTAL_INCREASING,
                 ),
                 cv.Optional(CONF_TIME): sensor.sensor_schema(
                     unit_of_measurement=UNIT_MINUTE,
@@ -209,7 +210,7 @@ CONFIG_SCHEMA = cv.typed_schema(
                     icon=ICON_RADIATOR,
                     accuracy_decimals=0,
                     device_class=DEVICE_CLASS_ENERGY,
-                    state_class=STATE_CLASS_MEASUREMENT,
+                    state_class=STATE_CLASS_TOTAL_INCREASING,
                 ),
                 cv.Optional(CONF_TIME): sensor.sensor_schema(
                     unit_of_measurement=UNIT_MINUTE,
@@ -290,7 +291,7 @@ CONFIG_SCHEMA = cv.typed_schema(
                     icon=ICON_RADIATOR,
                     accuracy_decimals=0,
                     device_class=DEVICE_CLASS_ENERGY,
-                    state_class=STATE_CLASS_MEASUREMENT,
+                    state_class=STATE_CLASS_TOTAL_INCREASING,
                 ),
                 cv.Optional(CONF_TIME): sensor.sensor_schema(
                     unit_of_measurement=UNIT_MINUTE,
@@ -353,7 +354,7 @@ CONFIG_SCHEMA = cv.typed_schema(
                     icon=ICON_RADIATOR,
                     accuracy_decimals=0,
                     device_class=DEVICE_CLASS_ENERGY,
-                    state_class=STATE_CLASS_MEASUREMENT,
+                    state_class=STATE_CLASS_TOTAL_INCREASING,
                 ),
                 cv.Optional(CONF_VERSION): sensor.sensor_schema(
                     accuracy_decimals=2,
@@ -433,7 +434,7 @@ CONFIG_SCHEMA = cv.typed_schema(
                     icon=ICON_RADIATOR,
                     accuracy_decimals=0,
                     device_class=DEVICE_CLASS_ENERGY,
-                    state_class=STATE_CLASS_MEASUREMENT,
+                    state_class=STATE_CLASS_TOTAL_INCREASING,
                 ),
                 cv.Optional(CONF_TIME): sensor.sensor_schema(
                     unit_of_measurement=UNIT_MINUTE,

From d4cb29a38050b1dd5c838a60b689f406753c058b Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Fri, 27 Oct 2023 17:36:43 -0500
Subject: [PATCH 078/131] Fix xpt2046 for IDF 5 (#5614)

---
 esphome/components/xpt2046/xpt2046.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esphome/components/xpt2046/xpt2046.cpp b/esphome/components/xpt2046/xpt2046.cpp
index 6c7c55a995..078a1b01e9 100644
--- a/esphome/components/xpt2046/xpt2046.cpp
+++ b/esphome/components/xpt2046/xpt2046.cpp
@@ -3,6 +3,7 @@
 #include "esphome/core/helpers.h"
 
 #include <algorithm>
+#include <cinttypes>
 
 namespace esphome {
 namespace xpt2046 {
@@ -151,7 +152,7 @@ void XPT2046Component::dump_config() {
   ESP_LOGCONFIG(TAG, "  Invert Y: %s", YESNO(this->invert_y_));
 
   ESP_LOGCONFIG(TAG, "  threshold: %d", this->threshold_);
-  ESP_LOGCONFIG(TAG, "  Report interval: %u", this->report_millis_);
+  ESP_LOGCONFIG(TAG, "  Report interval: %" PRIu32, this->report_millis_);
 
   LOG_UPDATE_INTERVAL(this);
 }

From f7f63c9da1405024710e98c0927863aeddf454c7 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 29 Oct 2023 00:49:19 -0500
Subject: [PATCH 079/131] IDF 5 fixes for various components from test4.yaml
 (#5622)

---
 .../esp32_camera_web_server/camera_web_server.cpp           | 6 +++---
 .../components/esp32_camera_web_server/camera_web_server.h  | 1 +
 esphome/components/tuya/tuya.cpp                            | 6 +++---
 esphome/components/tuya/tuya.h                              | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/esphome/components/esp32_camera_web_server/camera_web_server.cpp b/esphome/components/esp32_camera_web_server/camera_web_server.cpp
index 3210989ff5..7ca0c56d23 100644
--- a/esphome/components/esp32_camera_web_server/camera_web_server.cpp
+++ b/esphome/components/esp32_camera_web_server/camera_web_server.cpp
@@ -194,8 +194,8 @@ esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
       int64_t frame_time = millis() - last_frame;
       last_frame = millis();
 
-      ESP_LOGD(TAG, "MJPG: %uB %ums (%.1ffps)", (uint32_t) image->get_data_length(), (uint32_t) frame_time,
-               1000.0 / (uint32_t) frame_time);
+      ESP_LOGD(TAG, "MJPG: %" PRIu32 "B %" PRIu32 "ms (%.1ffps)", (uint32_t) image->get_data_length(),
+               (uint32_t) frame_time, 1000.0 / (uint32_t) frame_time);
     }
   }
 
@@ -205,7 +205,7 @@ esp_err_t CameraWebServer::streaming_handler_(struct httpd_req *req) {
 
   esp32_camera::global_esp32_camera->stop_stream(esphome::esp32_camera::WEB_REQUESTER);
 
-  ESP_LOGI(TAG, "STREAM: closed. Frames: %u", frames);
+  ESP_LOGI(TAG, "STREAM: closed. Frames: %" PRIu32, frames);
 
   return res;
 }
diff --git a/esphome/components/esp32_camera_web_server/camera_web_server.h b/esphome/components/esp32_camera_web_server/camera_web_server.h
index 509ca81592..f65625554c 100644
--- a/esphome/components/esp32_camera_web_server/camera_web_server.h
+++ b/esphome/components/esp32_camera_web_server/camera_web_server.h
@@ -2,6 +2,7 @@
 
 #ifdef USE_ESP32
 
+#include <cinttypes>
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 
diff --git a/esphome/components/tuya/tuya.cpp b/esphome/components/tuya/tuya.cpp
index daf5080e7a..da03e3faad 100644
--- a/esphome/components/tuya/tuya.cpp
+++ b/esphome/components/tuya/tuya.cpp
@@ -61,7 +61,7 @@ void Tuya::dump_config() {
     } else if (info.type == TuyaDatapointType::ENUM) {
       ESP_LOGCONFIG(TAG, "  Datapoint %u: enum (value: %d)", info.id, info.value_enum);
     } else if (info.type == TuyaDatapointType::BITMASK) {
-      ESP_LOGCONFIG(TAG, "  Datapoint %u: bitmask (value: %x)", info.id, info.value_bitmask);
+      ESP_LOGCONFIG(TAG, "  Datapoint %u: bitmask (value: %" PRIx32 ")", info.id, info.value_bitmask);
     } else {
       ESP_LOGCONFIG(TAG, "  Datapoint %u: unknown", info.id);
     }
@@ -342,7 +342,7 @@ void Tuya::handle_datapoints_(const uint8_t *buffer, size_t len) {
             ESP_LOGW(TAG, "Datapoint %u has bad bitmask len %zu", datapoint.id, data_size);
             return;
         }
-        ESP_LOGD(TAG, "Datapoint %u update to %#08X", datapoint.id, datapoint.value_bitmask);
+        ESP_LOGD(TAG, "Datapoint %u update to %#08" PRIX32, datapoint.id, datapoint.value_bitmask);
         break;
       default:
         ESP_LOGW(TAG, "Datapoint %u has unknown type %#02hhX", datapoint.id, static_cast<uint8_t>(datapoint.type));
@@ -594,7 +594,7 @@ optional<TuyaDatapoint> Tuya::get_datapoint_(uint8_t datapoint_id) {
 
 void Tuya::set_numeric_datapoint_value_(uint8_t datapoint_id, TuyaDatapointType datapoint_type, const uint32_t value,
                                         uint8_t length, bool forced) {
-  ESP_LOGD(TAG, "Setting datapoint %u to %u", datapoint_id, value);
+  ESP_LOGD(TAG, "Setting datapoint %u to %" PRIu32, datapoint_id, value);
   optional<TuyaDatapoint> datapoint = this->get_datapoint_(datapoint_id);
   if (!datapoint.has_value()) {
     ESP_LOGW(TAG, "Setting unknown datapoint %u", datapoint_id);
diff --git a/esphome/components/tuya/tuya.h b/esphome/components/tuya/tuya.h
index 26f6f65912..27a97c3dc9 100644
--- a/esphome/components/tuya/tuya.h
+++ b/esphome/components/tuya/tuya.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cinttypes>
+#include <vector>
+
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
@@ -10,8 +13,6 @@
 #include "esphome/core/time.h"
 #endif
 
-#include <vector>
-
 namespace esphome {
 namespace tuya {
 

From 7cf056e828682ddfcc39adcea8ac36eb3a72c288 Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Sun, 29 Oct 2023 00:50:26 -0500
Subject: [PATCH 080/131] IDF 5 fixes for various components from test2.yaml
 (#5621)

---
 esphome/components/duty_time/duty_time_sensor.cpp    |  2 +-
 esphome/components/duty_time/duty_time_sensor.h      |  2 ++
 .../components/mopeka_pro_check/mopeka_pro_check.cpp |  2 +-
 .../components/mopeka_pro_check/mopeka_pro_check.h   |  5 +++--
 .../components/mopeka_std_check/mopeka_std_check.cpp |  4 ++--
 .../components/mopeka_std_check/mopeka_std_check.h   |  1 +
 esphome/components/sgp4x/sgp4x.cpp                   | 12 ++++++------
 esphome/components/sgp4x/sgp4x.h                     |  5 +++--
 8 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/esphome/components/duty_time/duty_time_sensor.cpp b/esphome/components/duty_time/duty_time_sensor.cpp
index 1101c4d41e..d4369c89c0 100644
--- a/esphome/components/duty_time/duty_time_sensor.cpp
+++ b/esphome/components/duty_time/duty_time_sensor.cpp
@@ -95,7 +95,7 @@ void DutyTimeSensor::publish_and_save_(const uint32_t sec, const uint32_t ms) {
 
 void DutyTimeSensor::dump_config() {
   ESP_LOGCONFIG(TAG, "Duty Time:");
-  ESP_LOGCONFIG(TAG, "  Update Interval: %dms", this->get_update_interval());
+  ESP_LOGCONFIG(TAG, "  Update Interval: %" PRId32 "ms", this->get_update_interval());
   ESP_LOGCONFIG(TAG, "  Restore: %s", ONOFF(this->restore_));
   LOG_SENSOR("  ", "Duty Time Sensor:", this);
   LOG_SENSOR("  ", "Last Duty Time Sensor:", this->last_duty_time_sensor_);
diff --git a/esphome/components/duty_time/duty_time_sensor.h b/esphome/components/duty_time/duty_time_sensor.h
index 1ec2f7b94f..38655f104a 100644
--- a/esphome/components/duty_time/duty_time_sensor.h
+++ b/esphome/components/duty_time/duty_time_sensor.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cinttypes>
+
 #include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/preferences.h"
diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
index 02d77a6b33..e543ceb864 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.cpp
@@ -69,7 +69,7 @@ bool MopekaProCheck::parse_device(const esp32_ble_tracker::ESPBTDevice &device)
   if ((this->distance_ != nullptr) || (this->level_ != nullptr)) {
     uint32_t distance_value = this->parse_distance_(manu_data.data);
     SensorReadQuality quality_value = this->parse_read_quality_(manu_data.data);
-    ESP_LOGD(TAG, "Distance Sensor: Quality (0x%X) Distance (%dmm)", quality_value, distance_value);
+    ESP_LOGD(TAG, "Distance Sensor: Quality (0x%X) Distance (%" PRId32 "mm)", quality_value, distance_value);
     if (quality_value < QUALITY_HIGH) {
       ESP_LOGW(TAG, "Poor read quality.");
     }
diff --git a/esphome/components/mopeka_pro_check/mopeka_pro_check.h b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
index 8b126a204c..b5dff153e7 100644
--- a/esphome/components/mopeka_pro_check/mopeka_pro_check.h
+++ b/esphome/components/mopeka_pro_check/mopeka_pro_check.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <cinttypes>
+#include <vector>
+
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 
-#include <vector>
-
 #ifdef USE_ESP32
 
 namespace esphome {
diff --git a/esphome/components/mopeka_std_check/mopeka_std_check.cpp b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
index 9dd1718cb2..6685a23c41 100644
--- a/esphome/components/mopeka_std_check/mopeka_std_check.cpp
+++ b/esphome/components/mopeka_std_check/mopeka_std_check.cpp
@@ -16,8 +16,8 @@ static const uint16_t MANUFACTURER_ID = 0x000D;
 void MopekaStdCheck::dump_config() {
   ESP_LOGCONFIG(TAG, "Mopeka Std Check");
   ESP_LOGCONFIG(TAG, "  Propane Butane mix: %.0f%%", this->propane_butane_mix_ * 100);
-  ESP_LOGCONFIG(TAG, "  Tank distance empty: %imm", this->empty_mm_);
-  ESP_LOGCONFIG(TAG, "  Tank distance full: %imm", this->full_mm_);
+  ESP_LOGCONFIG(TAG, "  Tank distance empty: %" PRIi32 "mm", this->empty_mm_);
+  ESP_LOGCONFIG(TAG, "  Tank distance full: %" PRIi32 "mm", this->full_mm_);
   LOG_SENSOR("  ", "Level", this->level_);
   LOG_SENSOR("  ", "Temperature", this->temperature_);
   LOG_SENSOR("  ", "Battery Level", this->battery_level_);
diff --git a/esphome/components/mopeka_std_check/mopeka_std_check.h b/esphome/components/mopeka_std_check/mopeka_std_check.h
index ee588c8e5f..2a1d9d2dfc 100644
--- a/esphome/components/mopeka_std_check/mopeka_std_check.h
+++ b/esphome/components/mopeka_std_check/mopeka_std_check.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <cinttypes>
 #include <vector>
 
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
diff --git a/esphome/components/sgp4x/sgp4x.cpp b/esphome/components/sgp4x/sgp4x.cpp
index a48372aab7..561d41e225 100644
--- a/esphome/components/sgp4x/sgp4x.cpp
+++ b/esphome/components/sgp4x/sgp4x.cpp
@@ -70,15 +70,15 @@ void SGP4xComponent::setup() {
     if (this->pref_.load(&this->voc_baselines_storage_)) {
       this->voc_state0_ = this->voc_baselines_storage_.state0;
       this->voc_state1_ = this->voc_baselines_storage_.state1;
-      ESP_LOGI(TAG, "Loaded VOC baseline state0: 0x%04X, state1: 0x%04X", this->voc_baselines_storage_.state0,
-               voc_baselines_storage_.state1);
+      ESP_LOGI(TAG, "Loaded VOC baseline state0: 0x%04" PRIX32 ", state1: 0x%04" PRIX32,
+               this->voc_baselines_storage_.state0, voc_baselines_storage_.state1);
     }
 
     // Initialize storage timestamp
     this->seconds_since_last_store_ = 0;
 
     if (this->voc_baselines_storage_.state0 > 0 && this->voc_baselines_storage_.state1 > 0) {
-      ESP_LOGI(TAG, "Setting VOC baseline from save state0: 0x%04X, state1: 0x%04X",
+      ESP_LOGI(TAG, "Setting VOC baseline from save state0: 0x%04" PRIX32 ", state1: 0x%04" PRIX32,
                this->voc_baselines_storage_.state0, voc_baselines_storage_.state1);
       voc_algorithm_.set_states(this->voc_baselines_storage_.state0, this->voc_baselines_storage_.state1);
     }
@@ -178,8 +178,8 @@ bool SGP4xComponent::measure_gas_indices_(int32_t &voc, int32_t &nox) {
       this->voc_baselines_storage_.state1 = this->voc_state1_;
 
       if (this->pref_.save(&this->voc_baselines_storage_)) {
-        ESP_LOGI(TAG, "Stored VOC baseline state0: 0x%04X ,state1: 0x%04X", this->voc_baselines_storage_.state0,
-                 voc_baselines_storage_.state1);
+        ESP_LOGI(TAG, "Stored VOC baseline state0: 0x%04" PRIX32 " ,state1: 0x%04" PRIX32,
+                 this->voc_baselines_storage_.state0, voc_baselines_storage_.state1);
       } else {
         ESP_LOGW(TAG, "Could not store VOC baselines");
       }
@@ -273,7 +273,7 @@ void SGP4xComponent::update_gas_indices() {
   }
   if (this->samples_read_ < this->samples_to_stabilize_) {
     this->samples_read_++;
-    ESP_LOGD(TAG, "Sensor has not collected enough samples yet. (%d/%d) VOC index is: %u", this->samples_read_,
+    ESP_LOGD(TAG, "Sensor has not collected enough samples yet. (%d/%d) VOC index is: %" PRIu32, this->samples_read_,
              this->samples_to_stabilize_, this->voc_index_);
     return;
   }
diff --git a/esphome/components/sgp4x/sgp4x.h b/esphome/components/sgp4x/sgp4x.h
index 3a8d8200a7..aa5ae4b9d2 100644
--- a/esphome/components/sgp4x/sgp4x.h
+++ b/esphome/components/sgp4x/sgp4x.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cinttypes>
+#include <cmath>
+
 #include "esphome/core/component.h"
 #include "esphome/components/sensor/sensor.h"
 #include "esphome/components/sensirion_common/i2c_sensirion.h"
@@ -8,8 +11,6 @@
 #include <VOCGasIndexAlgorithm.h>
 #include <NOxGasIndexAlgorithm.h>
 
-#include <cmath>
-
 namespace esphome {
 namespace sgp4x {
 

From 01a16141f1973558119f1178169620d619b4d550 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Sun, 29 Oct 2023 19:35:33 +0100
Subject: [PATCH 081/131] Fixes ip include on arduino 2.7.4 (#5620)

---
 esphome/components/network/ip_address.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/esphome/components/network/ip_address.h b/esphome/components/network/ip_address.h
index 7bf09078be..709524c9d1 100644
--- a/esphome/components/network/ip_address.h
+++ b/esphome/components/network/ip_address.h
@@ -3,7 +3,11 @@
 #include <string>
 #include <cstdio>
 #include <array>
+#include "esphome/core/macros.h"
+
+#if defined(USE_ESP_IDF) || defined(USE_LIBRETINY) || USE_ARDUINO_VERSION_CODE > VERSION_CODE(3, 0, 0)
 #include <lwip/ip_addr.h>
+#endif
 
 #if USE_ARDUINO
 #include <Arduino.h>

From f36ec7c72694b0bf4d56d14a056c8e7f8f21d822 Mon Sep 17 00:00:00 2001
From: Dewet Diener <dewet22@users.noreply.github.com>
Date: Sun, 29 Oct 2023 19:05:18 +0000
Subject: [PATCH 082/131] Fix bug when requesting italic gfonts (#5623)

---
 esphome/components/font/__init__.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/esphome/components/font/__init__.py b/esphome/components/font/__init__.py
index 2bd6beeaeb..7e34dff22d 100644
--- a/esphome/components/font/__init__.py
+++ b/esphome/components/font/__init__.py
@@ -137,11 +137,10 @@ def validate_weight_name(value):
 
 
 def download_gfonts(value):
-    wght = value[CONF_WEIGHT]
-    if value[CONF_ITALIC]:
-        wght = f"1,{wght}"
-    name = f"{value[CONF_FAMILY]}@{value[CONF_WEIGHT]}"
-    url = f"https://fonts.googleapis.com/css2?family={value[CONF_FAMILY]}:wght@{wght}"
+    name = (
+        f"{value[CONF_FAMILY]}:ital,wght@{int(value[CONF_ITALIC])},{value[CONF_WEIGHT]}"
+    )
+    url = f"https://fonts.googleapis.com/css2?family={name}"
 
     path = _compute_gfonts_local_path(value)
     if path.is_file():

From 0c46403eaffc9c6efc09a8b88b7d7608de399ee4 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 30 Oct 2023 11:00:47 +1300
Subject: [PATCH 083/131] Handle enum type in tuya text_sensor (#5626)

---
 esphome/components/tuya/text_sensor/tuya_text_sensor.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/esphome/components/tuya/text_sensor/tuya_text_sensor.cpp b/esphome/components/tuya/text_sensor/tuya_text_sensor.cpp
index 602595e89d..fbe511811f 100644
--- a/esphome/components/tuya/text_sensor/tuya_text_sensor.cpp
+++ b/esphome/components/tuya/text_sensor/tuya_text_sensor.cpp
@@ -1,5 +1,5 @@
-#include "esphome/core/log.h"
 #include "tuya_text_sensor.h"
+#include "esphome/core/log.h"
 
 namespace esphome {
 namespace tuya {
@@ -19,6 +19,12 @@ void TuyaTextSensor::setup() {
         this->publish_state(data);
         break;
       }
+      case TuyaDatapointType::ENUM: {
+        std::string data = to_string(datapoint.value_enum);
+        ESP_LOGD(TAG, "MCU reported text sensor %u is: %s", datapoint.id, data.c_str());
+        this->publish_state(data);
+        break;
+      }
       default:
         ESP_LOGW(TAG, "Unsupported data type for tuya text sensor %u: %#02hhX", datapoint.id, (uint8_t) datapoint.type);
         break;

From 27b593ba85d26be8445b7868dc56db51304e198b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:02:49 +1300
Subject: [PATCH 084/131] Add connection triggers to api (#5628)

---
 esphome/components/api/__init__.py        | 22 ++++++++
 esphome/components/api/api_connection.cpp | 62 +++++++++++++----------
 esphome/components/api/api_connection.h   |  2 +
 esphome/components/api/api_server.cpp     |  1 +
 esphome/components/api/api_server.h       |  8 +++
 5 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index 1076ebc707..ec1a56bd2c 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -45,6 +45,8 @@ SERVICE_ARG_NATIVE_TYPES = {
     "string[]": cg.std_vector.template(cg.std_string),
 }
 CONF_ENCRYPTION = "encryption"
+CONF_ON_CLIENT_CONNECTED = "on_client_connected"
+CONF_ON_CLIENT_DISCONNECTED = "on_client_disconnected"
 
 
 def validate_encryption_key(value):
@@ -87,6 +89,12 @@ CONFIG_SCHEMA = cv.Schema(
                 cv.Required(CONF_KEY): validate_encryption_key,
             }
         ),
+        cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
+            single=True
+        ),
+        cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
+            single=True
+        ),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -116,6 +124,20 @@ async def to_code(config):
         cg.add(var.register_user_service(trigger))
         await automation.build_automation(trigger, func_args, conf)
 
+    if CONF_ON_CLIENT_CONNECTED in config:
+        await automation.build_automation(
+            var.get_client_connected_trigger(),
+            [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
+            config[CONF_ON_CLIENT_CONNECTED],
+        )
+
+    if CONF_ON_CLIENT_DISCONNECTED in config:
+        await automation.build_automation(
+            var.get_client_disconnected_trigger(),
+            [(cg.std_string, "client_info"), (cg.std_string, "client_address")],
+            config[CONF_ON_CLIENT_DISCONNECTED],
+        )
+
     if encryption_config := config.get(CONF_ENCRYPTION):
         decoded = base64.b64decode(encryption_config[CONF_KEY])
         cg.add(var.set_noise_psk(list(decoded)))
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index 03eaa159c7..d1e7513d11 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -32,9 +32,9 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
   this->proto_write_buffer_.reserve(64);
 
 #if defined(USE_API_PLAINTEXT)
-  helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
+  this->helper_ = std::unique_ptr<APIFrameHelper>{new APIPlaintextFrameHelper(std::move(sock))};
 #elif defined(USE_API_NOISE)
-  helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), parent->get_noise_ctx())};
+  this->helper_ = std::unique_ptr<APIFrameHelper>{new APINoiseFrameHelper(std::move(sock), parent->get_noise_ctx())};
 #else
 #error "No frame helper defined"
 #endif
@@ -42,14 +42,16 @@ APIConnection::APIConnection(std::unique_ptr<socket::Socket> sock, APIServer *pa
 void APIConnection::start() {
   this->last_traffic_ = millis();
 
-  APIError err = helper_->init();
+  APIError err = this->helper_->init();
   if (err != APIError::OK) {
     on_fatal_error();
-    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
+    ESP_LOGW(TAG, "%s: Helper init failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+             errno);
     return;
   }
-  client_info_ = helper_->getpeername();
-  helper_->set_log_info(client_info_);
+  this->client_info_ = helper_->getpeername();
+  this->client_peername_ = this->client_info_;
+  this->helper_->set_log_info(this->client_info_);
 }
 
 APIConnection::~APIConnection() {
@@ -68,7 +70,7 @@ void APIConnection::loop() {
     // when network is disconnected force disconnect immediately
     // don't wait for timeout
     this->on_fatal_error();
-    ESP_LOGW(TAG, "%s: Network unavailable, disconnecting", client_info_.c_str());
+    ESP_LOGW(TAG, "%s: Network unavailable, disconnecting", this->client_combined_info_.c_str());
     return;
   }
   if (this->next_close_) {
@@ -78,24 +80,26 @@ void APIConnection::loop() {
     return;
   }
 
-  APIError err = helper_->loop();
+  APIError err = this->helper_->loop();
   if (err != APIError::OK) {
     on_fatal_error();
-    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
+    ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
+             api_error_to_str(err), errno);
     return;
   }
   ReadPacketBuffer buffer;
-  err = helper_->read_packet(&buffer);
+  err = this->helper_->read_packet(&buffer);
   if (err == APIError::WOULD_BLOCK) {
     // pass
   } else if (err != APIError::OK) {
     on_fatal_error();
     if (err == APIError::SOCKET_READ_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset", client_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
     } else if (err == APIError::CONNECTION_CLOSED) {
-      ESP_LOGW(TAG, "%s: Connection closed", client_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection closed", this->client_combined_info_.c_str());
     } else {
-      ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Reading failed: %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+               errno);
     }
     return;
   } else {
@@ -115,7 +119,7 @@ void APIConnection::loop() {
     // Disconnect if not responded within 2.5*keepalive
     if (now - this->last_traffic_ > (keepalive * 5) / 2) {
       on_fatal_error();
-      ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_info_.c_str());
+      ESP_LOGW(TAG, "%s didn't respond to ping request in time. Disconnecting...", this->client_combined_info_.c_str());
     }
   } else if (now - this->last_traffic_ > keepalive) {
     ESP_LOGVV(TAG, "Sending keepalive PING...");
@@ -169,7 +173,7 @@ DisconnectResponse APIConnection::disconnect(const DisconnectRequest &msg) {
   // remote initiated disconnect_client
   // don't close yet, we still need to send the disconnect response
   // close will happen on next loop
-  ESP_LOGD(TAG, "%s requested disconnected", client_info_.c_str());
+  ESP_LOGD(TAG, "%s requested disconnected", this->client_combined_info_.c_str());
   this->next_close_ = true;
   DisconnectResponse resp;
   return resp;
@@ -1045,12 +1049,14 @@ bool APIConnection::send_log_message(int level, const char *tag, const char *lin
 }
 
 HelloResponse APIConnection::hello(const HelloRequest &msg) {
-  this->client_info_ = msg.client_info + " (" + this->helper_->getpeername() + ")";
-  this->helper_->set_log_info(client_info_);
+  this->client_info_ = msg.client_info;
+  this->client_peername_ = this->helper_->getpeername();
+  this->client_combined_info_ = this->client_info_ + " (" + this->client_peername_ + ")";
+  this->helper_->set_log_info(this->client_combined_info_);
   this->client_api_version_major_ = msg.api_version_major;
   this->client_api_version_minor_ = msg.api_version_minor;
-  ESP_LOGV(TAG, "Hello from client: '%s' | API Version %" PRIu32 ".%" PRIu32, this->client_info_.c_str(),
-           this->client_api_version_major_, this->client_api_version_minor_);
+  ESP_LOGV(TAG, "Hello from client: '%s' | %s | API Version %" PRIu32 ".%" PRIu32, this->client_info_.c_str(),
+           this->client_peername_.c_str(), this->client_api_version_major_, this->client_api_version_minor_);
 
   HelloResponse resp;
   resp.api_version_major = 1;
@@ -1068,9 +1074,9 @@ ConnectResponse APIConnection::connect(const ConnectRequest &msg) {
   // bool invalid_password = 1;
   resp.invalid_password = !correct;
   if (correct) {
-    ESP_LOGD(TAG, "%s: Connected successfully", this->client_info_.c_str());
+    ESP_LOGD(TAG, "%s: Connected successfully", this->client_combined_info_.c_str());
     this->connection_state_ = ConnectionState::AUTHENTICATED;
-
+    this->parent_->get_client_connected_trigger()->trigger(this->client_info_, this->client_peername_);
 #ifdef USE_HOMEASSISTANT_TIME
     if (homeassistant::global_homeassistant_time != nullptr) {
       this->send_time_request();
@@ -1145,10 +1151,11 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
     return false;
   if (!this->helper_->can_write_without_blocking()) {
     delay(0);
-    APIError err = helper_->loop();
+    APIError err = this->helper_->loop();
     if (err != APIError::OK) {
       on_fatal_error();
-      ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Socket operation failed: %s errno=%d", this->client_combined_info_.c_str(),
+               api_error_to_str(err), errno);
       return false;
     }
     if (!this->helper_->can_write_without_blocking()) {
@@ -1167,9 +1174,10 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
   if (err != APIError::OK) {
     on_fatal_error();
     if (err == APIError::SOCKET_WRITE_FAILED && errno == ECONNRESET) {
-      ESP_LOGW(TAG, "%s: Connection reset", client_info_.c_str());
+      ESP_LOGW(TAG, "%s: Connection reset", this->client_combined_info_.c_str());
     } else {
-      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", client_info_.c_str(), api_error_to_str(err), errno);
+      ESP_LOGW(TAG, "%s: Packet write failed %s errno=%d", this->client_combined_info_.c_str(), api_error_to_str(err),
+               errno);
     }
     return false;
   }
@@ -1178,11 +1186,11 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint32_t message_type)
 }
 void APIConnection::on_unauthenticated_access() {
   this->on_fatal_error();
-  ESP_LOGD(TAG, "%s: tried to access without authentication.", this->client_info_.c_str());
+  ESP_LOGD(TAG, "%s: tried to access without authentication.", this->client_combined_info_.c_str());
 }
 void APIConnection::on_no_setup_connection() {
   this->on_fatal_error();
-  ESP_LOGD(TAG, "%s: tried to access without full connection.", this->client_info_.c_str());
+  ESP_LOGD(TAG, "%s: tried to access without full connection.", this->client_combined_info_.c_str());
 }
 void APIConnection::on_fatal_error() {
   this->helper_->close();
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index c17aaab611..21ee85daab 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -207,6 +207,8 @@ class APIConnection : public APIServerConnection {
   std::unique_ptr<APIFrameHelper> helper_;
 
   std::string client_info_;
+  std::string client_peername_;
+  std::string client_combined_info_;
   uint32_t client_api_version_major_{0};
   uint32_t client_api_version_minor_{0};
 #ifdef USE_ESP32_CAMERA
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index c4edddc92b..5268b30132 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -111,6 +111,7 @@ void APIServer::loop() {
                                 [](const std::unique_ptr<APIConnection> &conn) { return !conn->remove_; });
   // print disconnection messages
   for (auto it = new_end; it != this->clients_.end(); ++it) {
+    this->client_disconnected_trigger_->trigger((*it)->client_info_, (*it)->client_peername_);
     ESP_LOGV(TAG, "Removing connection to %s", (*it)->client_info_.c_str());
   }
   // resize vector
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index 4d359ebb79..f1fb31fa8b 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -4,6 +4,7 @@
 #include "api_pb2.h"
 #include "api_pb2_service.h"
 #include "esphome/components/socket/socket.h"
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/controller.h"
 #include "esphome/core/defines.h"
@@ -106,6 +107,11 @@ class APIServer : public Component, public Controller {
   const std::vector<HomeAssistantStateSubscription> &get_state_subs() const;
   const std::vector<UserServiceDescriptor *> &get_user_services() const { return this->user_services_; }
 
+  Trigger<std::string, std::string> *get_client_connected_trigger() const { return this->client_connected_trigger_; }
+  Trigger<std::string, std::string> *get_client_disconnected_trigger() const {
+    return this->client_disconnected_trigger_;
+  }
+
  protected:
   std::unique_ptr<socket::Socket> socket_ = nullptr;
   uint16_t port_{6053};
@@ -115,6 +121,8 @@ class APIServer : public Component, public Controller {
   std::string password_;
   std::vector<HomeAssistantStateSubscription> state_subs_;
   std::vector<UserServiceDescriptor *> user_services_;
+  Trigger<std::string, std::string> *client_connected_trigger_ = new Trigger<std::string, std::string>();
+  Trigger<std::string, std::string> *client_disconnected_trigger_ = new Trigger<std::string, std::string>();
 
 #ifdef USE_API_NOISE
   std::shared_ptr<APINoiseContext> noise_ctx_ = std::make_shared<APINoiseContext>();

From 9dfcf801a3da28b4c32b35258ffeefc4cc118a7e Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 30 Oct 2023 12:07:25 -0700
Subject: [PATCH 085/131] Fix armv7 docker builds (#5630)

---
 docker/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index f076173519..61774f0a63 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -43,10 +43,11 @@ RUN \
           zlib1g-dev=1:1.2.13.dfsg-1 \
           libjpeg-dev=1:2.1.5-2 \
           libfreetype-dev=2.12.1+dfsg-5 \
-          libssl-dev=3.0.11-1~deb12u1 \
+          libssl-dev=3.0.11-1~deb12u2 \
           libffi-dev=3.4.4-1 \
           cargo=0.66.0+ds1-1 \
           pkg-config=1.8.1-1; \
+          gcc-arm-linux-gnueabihf=4:12.2.0-3; \
     fi; \
     rm -rf \
         /tmp/* \

From 69ec647f7ead96941369a0832600b6aa672e739a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Oct 2023 14:57:41 -0700
Subject: [PATCH 086/131] Bump aioesphomeapi from 18.0.12 to 18.2.0 (#5606)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 630802ee74..314f3b453f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
-aioesphomeapi==18.0.12
+aioesphomeapi==18.2.0
 zeroconf==0.119.0
 
 # esp-idf requires this, but doesn't bundle it by default

From 193bac94f4863fac2ac404b0a44663f6da83e976 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:16:42 +1300
Subject: [PATCH 087/131] Add on_client_connected and disconnected to voice
 assistant (#5629)

---
 esphome/components/api/__init__.py            |  4 +-
 esphome/components/api/api_connection.cpp     | 22 +++++++--
 esphome/components/api/api_connection.h       | 10 ++--
 esphome/components/api/api_server.cpp         | 24 ----------
 esphome/components/api/api_server.h           |  6 ---
 .../components/voice_assistant/__init__.py    | 22 +++++++++
 .../voice_assistant/voice_assistant.cpp       | 46 ++++++++++++++++---
 .../voice_assistant/voice_assistant.h         | 13 +++++-
 esphome/const.py                              |  2 +
 9 files changed, 98 insertions(+), 51 deletions(-)

diff --git a/esphome/components/api/__init__.py b/esphome/components/api/__init__.py
index ec1a56bd2c..d6b4416af8 100644
--- a/esphome/components/api/__init__.py
+++ b/esphome/components/api/__init__.py
@@ -18,6 +18,8 @@ from esphome.const import (
     CONF_TRIGGER_ID,
     CONF_EVENT,
     CONF_TAG,
+    CONF_ON_CLIENT_CONNECTED,
+    CONF_ON_CLIENT_DISCONNECTED,
 )
 from esphome.core import coroutine_with_priority
 
@@ -45,8 +47,6 @@ SERVICE_ARG_NATIVE_TYPES = {
     "string[]": cg.std_vector.template(cg.std_string),
 }
 CONF_ENCRYPTION = "encryption"
-CONF_ON_CLIENT_CONNECTED = "on_client_connected"
-CONF_ON_CLIENT_DISCONNECTED = "on_client_disconnected"
 
 
 def validate_encryption_key(value):
diff --git a/esphome/components/api/api_connection.cpp b/esphome/components/api/api_connection.cpp
index d1e7513d11..0389df215f 100644
--- a/esphome/components/api/api_connection.cpp
+++ b/esphome/components/api/api_connection.cpp
@@ -60,6 +60,11 @@ APIConnection::~APIConnection() {
     bluetooth_proxy::global_bluetooth_proxy->unsubscribe_api_connection(this);
   }
 #endif
+#ifdef USE_VOICE_ASSISTANT
+  if (voice_assistant::global_voice_assistant->get_api_connection() == this) {
+    voice_assistant::global_voice_assistant->client_subscription(this, false);
+  }
+#endif
 }
 
 void APIConnection::loop() {
@@ -950,14 +955,17 @@ BluetoothConnectionsFreeResponse APIConnection::subscribe_bluetooth_connections_
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-bool APIConnection::request_voice_assistant(const VoiceAssistantRequest &msg) {
-  if (!this->voice_assistant_subscription_)
-    return false;
-
-  return this->send_voice_assistant_request(msg);
+void APIConnection::subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) {
+  if (voice_assistant::global_voice_assistant != nullptr) {
+    voice_assistant::global_voice_assistant->client_subscription(this, msg.subscribe);
+  }
 }
 void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &msg) {
   if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     if (msg.error) {
       voice_assistant::global_voice_assistant->failed_to_start();
       return;
@@ -970,6 +978,10 @@ void APIConnection::on_voice_assistant_response(const VoiceAssistantResponse &ms
 };
 void APIConnection::on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) {
   if (voice_assistant::global_voice_assistant != nullptr) {
+    if (voice_assistant::global_voice_assistant->get_api_connection() != this) {
+      return;
+    }
+
     voice_assistant::global_voice_assistant->on_event(msg);
   }
 }
diff --git a/esphome/components/api/api_connection.h b/esphome/components/api/api_connection.h
index 21ee85daab..09b595bb71 100644
--- a/esphome/components/api/api_connection.h
+++ b/esphome/components/api/api_connection.h
@@ -126,10 +126,7 @@ class APIConnection : public APIServerConnection {
 #endif
 
 #ifdef USE_VOICE_ASSISTANT
-  void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) override {
-    this->voice_assistant_subscription_ = msg.subscribe;
-  }
-  bool request_voice_assistant(const VoiceAssistantRequest &msg);
+  void subscribe_voice_assistant(const SubscribeVoiceAssistantRequest &msg) override;
   void on_voice_assistant_response(const VoiceAssistantResponse &msg) override;
   void on_voice_assistant_event_response(const VoiceAssistantEventResponse &msg) override;
 #endif
@@ -188,6 +185,8 @@ class APIConnection : public APIServerConnection {
   }
   bool send_buffer(ProtoWriteBuffer buffer, uint32_t message_type) override;
 
+  std::string get_client_combined_info() const { return this->client_combined_info_; }
+
  protected:
   friend APIServer;
 
@@ -220,9 +219,6 @@ class APIConnection : public APIServerConnection {
   uint32_t last_traffic_;
   bool sent_ping_{false};
   bool service_call_subscription_{false};
-#ifdef USE_VOICE_ASSISTANT
-  bool voice_assistant_subscription_{false};
-#endif
   bool next_close_ = false;
   APIServer *parent_;
   InitialStateIterator initial_state_iterator_;
diff --git a/esphome/components/api/api_server.cpp b/esphome/components/api/api_server.cpp
index 5268b30132..0348112fcd 100644
--- a/esphome/components/api/api_server.cpp
+++ b/esphome/components/api/api_server.cpp
@@ -332,30 +332,6 @@ void APIServer::on_shutdown() {
   delay(10);
 }
 
-#ifdef USE_VOICE_ASSISTANT
-bool APIServer::start_voice_assistant(const std::string &conversation_id, uint32_t flags,
-                                      const api::VoiceAssistantAudioSettings &audio_settings) {
-  VoiceAssistantRequest msg;
-  msg.start = true;
-  msg.conversation_id = conversation_id;
-  msg.flags = flags;
-  msg.audio_settings = audio_settings;
-  for (auto &c : this->clients_) {
-    if (c->request_voice_assistant(msg))
-      return true;
-  }
-  return false;
-}
-void APIServer::stop_voice_assistant() {
-  VoiceAssistantRequest msg;
-  msg.start = false;
-  for (auto &c : this->clients_) {
-    if (c->request_voice_assistant(msg))
-      return;
-  }
-}
-#endif
-
 #ifdef USE_ALARM_CONTROL_PANEL
 void APIServer::on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) {
   if (obj->is_internal())
diff --git a/esphome/components/api/api_server.h b/esphome/components/api/api_server.h
index f1fb31fa8b..9605a196b3 100644
--- a/esphome/components/api/api_server.h
+++ b/esphome/components/api/api_server.h
@@ -84,12 +84,6 @@ class APIServer : public Component, public Controller {
   void request_time();
 #endif
 
-#ifdef USE_VOICE_ASSISTANT
-  bool start_voice_assistant(const std::string &conversation_id, uint32_t flags,
-                             const api::VoiceAssistantAudioSettings &audio_settings);
-  void stop_voice_assistant();
-#endif
-
 #ifdef USE_ALARM_CONTROL_PANEL
   void on_alarm_control_panel_update(alarm_control_panel::AlarmControlPanel *obj) override;
 #endif
diff --git a/esphome/components/voice_assistant/__init__.py b/esphome/components/voice_assistant/__init__.py
index 14176ad7cf..3270b9f370 100644
--- a/esphome/components/voice_assistant/__init__.py
+++ b/esphome/components/voice_assistant/__init__.py
@@ -6,6 +6,8 @@ from esphome.const import (
     CONF_MICROPHONE,
     CONF_SPEAKER,
     CONF_MEDIA_PLAYER,
+    CONF_ON_CLIENT_CONNECTED,
+    CONF_ON_CLIENT_DISCONNECTED,
 )
 from esphome import automation
 from esphome.automation import register_action, register_condition
@@ -80,6 +82,12 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_ON_TTS_END): automation.validate_automation(single=True),
             cv.Optional(CONF_ON_END): automation.validate_automation(single=True),
             cv.Optional(CONF_ON_ERROR): automation.validate_automation(single=True),
+            cv.Optional(CONF_ON_CLIENT_CONNECTED): automation.validate_automation(
+                single=True
+            ),
+            cv.Optional(CONF_ON_CLIENT_DISCONNECTED): automation.validate_automation(
+                single=True
+            ),
         }
     ).extend(cv.COMPONENT_SCHEMA),
 )
@@ -155,6 +163,20 @@ async def to_code(config):
             config[CONF_ON_ERROR],
         )
 
+    if CONF_ON_CLIENT_CONNECTED in config:
+        await automation.build_automation(
+            var.get_client_connected_trigger(),
+            [],
+            config[CONF_ON_CLIENT_CONNECTED],
+        )
+
+    if CONF_ON_CLIENT_DISCONNECTED in config:
+        await automation.build_automation(
+            var.get_client_disconnected_trigger(),
+            [],
+            config[CONF_ON_CLIENT_DISCONNECTED],
+        )
+
     cg.add_define("USE_VOICE_ASSISTANT")
 
 
diff --git a/esphome/components/voice_assistant/voice_assistant.cpp b/esphome/components/voice_assistant/voice_assistant.cpp
index df7853156d..d15d702d4b 100644
--- a/esphome/components/voice_assistant/voice_assistant.cpp
+++ b/esphome/components/voice_assistant/voice_assistant.cpp
@@ -127,8 +127,8 @@ int VoiceAssistant::read_microphone_() {
 }
 
 void VoiceAssistant::loop() {
-  if (this->state_ != State::IDLE && this->state_ != State::STOP_MICROPHONE &&
-      this->state_ != State::STOPPING_MICROPHONE && !api::global_api_server->is_connected()) {
+  if (this->api_client_ == nullptr && this->state_ != State::IDLE && this->state_ != State::STOP_MICROPHONE &&
+      this->state_ != State::STOPPING_MICROPHONE) {
     if (this->mic_->is_running() || this->state_ == State::STARTING_MICROPHONE) {
       this->set_state_(State::STOP_MICROPHONE, State::IDLE);
     } else {
@@ -213,7 +213,14 @@ void VoiceAssistant::loop() {
       audio_settings.noise_suppression_level = this->noise_suppression_level_;
       audio_settings.auto_gain = this->auto_gain_;
       audio_settings.volume_multiplier = this->volume_multiplier_;
-      if (!api::global_api_server->start_voice_assistant(this->conversation_id_, flags, audio_settings)) {
+
+      api::VoiceAssistantRequest msg;
+      msg.start = true;
+      msg.conversation_id = this->conversation_id_;
+      msg.flags = flags;
+      msg.audio_settings = audio_settings;
+
+      if (this->api_client_ == nullptr || !this->api_client_->send_voice_assistant_request(msg)) {
         ESP_LOGW(TAG, "Could not request start.");
         this->error_trigger_->trigger("not-connected", "Could not request start.");
         this->continuous_ = false;
@@ -326,6 +333,28 @@ void VoiceAssistant::loop() {
   }
 }
 
+void VoiceAssistant::client_subscription(api::APIConnection *client, bool subscribe) {
+  if (!subscribe) {
+    if (this->api_client_ == nullptr || client != this->api_client_) {
+      ESP_LOGE(TAG, "Client attempting to unsubscribe that is not the current API Client");
+      return;
+    }
+    this->api_client_ = nullptr;
+    this->client_disconnected_trigger_->trigger();
+    return;
+  }
+
+  if (this->api_client_ != nullptr) {
+    ESP_LOGE(TAG, "Multiple API Clients attempting to connect to Voice Assistant");
+    ESP_LOGE(TAG, "Current client: %s", this->api_client_->get_client_combined_info().c_str());
+    ESP_LOGE(TAG, "New client: %s", client->get_client_combined_info().c_str());
+    return;
+  }
+
+  this->api_client_ = client;
+  this->client_connected_trigger_->trigger();
+}
+
 static const LogString *voice_assistant_state_to_string(State state) {
   switch (state) {
     case State::IDLE:
@@ -408,7 +437,7 @@ void VoiceAssistant::start_streaming(struct sockaddr_storage *addr, uint16_t por
 }
 
 void VoiceAssistant::request_start(bool continuous, bool silence_detection) {
-  if (!api::global_api_server->is_connected()) {
+  if (this->api_client_ == nullptr) {
     ESP_LOGE(TAG, "No API client connected");
     this->set_state_(State::IDLE, State::IDLE);
     this->continuous_ = false;
@@ -459,9 +488,14 @@ void VoiceAssistant::request_stop() {
 }
 
 void VoiceAssistant::signal_stop_() {
-  ESP_LOGD(TAG, "Signaling stop...");
-  api::global_api_server->stop_voice_assistant();
   memset(&this->dest_addr_, 0, sizeof(this->dest_addr_));
+  if (this->api_client_ == nullptr) {
+    return;
+  }
+  ESP_LOGD(TAG, "Signaling stop...");
+  api::VoiceAssistantRequest msg;
+  msg.start = false;
+  this->api_client_->send_voice_assistant_request(msg);
 }
 
 void VoiceAssistant::on_event(const api::VoiceAssistantEventResponse &msg) {
diff --git a/esphome/components/voice_assistant/voice_assistant.h b/esphome/components/voice_assistant/voice_assistant.h
index cd448293db..a265522bca 100644
--- a/esphome/components/voice_assistant/voice_assistant.h
+++ b/esphome/components/voice_assistant/voice_assistant.h
@@ -8,8 +8,8 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 
+#include "esphome/components/api/api_connection.h"
 #include "esphome/components/api/api_pb2.h"
-#include "esphome/components/api/api_server.h"
 #include "esphome/components/microphone/microphone.h"
 #ifdef USE_SPEAKER
 #include "esphome/components/speaker/speaker.h"
@@ -109,6 +109,12 @@ class VoiceAssistant : public Component {
   Trigger<> *get_end_trigger() const { return this->end_trigger_; }
   Trigger<std::string, std::string> *get_error_trigger() const { return this->error_trigger_; }
 
+  Trigger<> *get_client_connected_trigger() const { return this->client_connected_trigger_; }
+  Trigger<> *get_client_disconnected_trigger() const { return this->client_disconnected_trigger_; }
+
+  void client_subscription(api::APIConnection *client, bool subscribe);
+  api::APIConnection *get_api_connection() const { return this->api_client_; }
+
  protected:
   int read_microphone_();
   void set_state_(State state);
@@ -127,6 +133,11 @@ class VoiceAssistant : public Component {
   Trigger<> *end_trigger_ = new Trigger<>();
   Trigger<std::string, std::string> *error_trigger_ = new Trigger<std::string, std::string>();
 
+  Trigger<> *client_connected_trigger_ = new Trigger<>();
+  Trigger<> *client_disconnected_trigger_ = new Trigger<>();
+
+  api::APIConnection *api_client_{nullptr};
+
   microphone::Microphone *mic_{nullptr};
 #ifdef USE_SPEAKER
   speaker::Speaker *speaker_{nullptr};
diff --git a/esphome/const.py b/esphome/const.py
index 6dde15303a..9457958863 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -485,6 +485,8 @@ CONF_ON_BLE_MANUFACTURER_DATA_ADVERTISE = "on_ble_manufacturer_data_advertise"
 CONF_ON_BLE_SERVICE_DATA_ADVERTISE = "on_ble_service_data_advertise"
 CONF_ON_BOOT = "on_boot"
 CONF_ON_CLICK = "on_click"
+CONF_ON_CLIENT_CONNECTED = "on_client_connected"
+CONF_ON_CLIENT_DISCONNECTED = "on_client_disconnected"
 CONF_ON_CONNECT = "on_connect"
 CONF_ON_CONTROL = "on_control"
 CONF_ON_DISCONNECT = "on_disconnect"

From b03eb5ea0a864035449a466923fcf64c086d478d Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@users.noreply.github.com>
Date: Tue, 31 Oct 2023 17:30:42 -0400
Subject: [PATCH 088/131] Ensure that all uses of strncpy in wifi component are
 safe. (#5636)

---
 esphome/components/wifi/wifi_component.cpp               | 4 ++--
 esphome/components/wifi/wifi_component_esp32_arduino.cpp | 8 ++++----
 esphome/components/wifi/wifi_component_esp8266.cpp       | 8 ++++----
 esphome/components/wifi/wifi_component_esp_idf.cpp       | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index b08f20de21..bd267fb0fd 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -261,8 +261,8 @@ void WiFiComponent::set_sta(const WiFiAP &ap) {
 void WiFiComponent::clear_sta() { this->sta_.clear(); }
 void WiFiComponent::save_wifi_sta(const std::string &ssid, const std::string &password) {
   SavedWifiSettings save{};
-  strncpy(save.ssid, ssid.c_str(), sizeof(save.ssid));
-  strncpy(save.password, password.c_str(), sizeof(save.password));
+  strncpy(save.ssid, ssid.c_str(), sizeof(save.ssid) - 1);
+  strncpy(save.password, password.c_str(), sizeof(save.password) - 1);
   this->pref_.save(&save);
   // ensure it's written immediately
   global_preferences->sync();
diff --git a/esphome/components/wifi/wifi_component_esp32_arduino.cpp b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
index 17b15757ef..c68c1b950c 100644
--- a/esphome/components/wifi/wifi_component_esp32_arduino.cpp
+++ b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
@@ -164,8 +164,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
   // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_wifi.html#_CPPv417wifi_sta_config_t
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid));
-  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password));
+  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password) - 1);
 
   // The weakest authmode to accept in the fast scan mode
   if (ap.get_password().empty()) {
@@ -661,7 +661,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
 
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid));
+  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid) - 1);
   conf.ap.channel = ap.get_channel().value_or(1);
   conf.ap.ssid_hidden = ap.get_ssid().size();
   conf.ap.max_connection = 5;
@@ -672,7 +672,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.ap.password = 0;
   } else {
     conf.ap.authmode = WIFI_AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.ssid));
+    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.ssid) - 1);
   }
 
   conf.ap.pairwise_cipher = WIFI_CIPHER_TYPE_CCMP;
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index a48c6c711d..b289157bee 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -230,8 +230,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
 
   struct station_config conf {};
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid));
-  strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password));
+  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password) - 1);
 
   if (ap.get_bssid().has_value()) {
     conf.bssid_set = 1;
@@ -759,7 +759,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     return false;
 
   struct softap_config conf {};
-  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid));
+  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid) - 1);
   conf.ssid_len = static_cast<uint8>(ap.get_ssid().size());
   conf.channel = ap.get_channel().value_or(1);
   conf.ssid_hidden = ap.get_hidden();
@@ -771,7 +771,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.password = 0;
   } else {
     conf.authmode = AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password));
+    strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password) - 1);
   }
 
   ETS_UART_INTR_DISABLE();
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 34ecaf887d..9d88848567 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -275,8 +275,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
   // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_wifi.html#_CPPv417wifi_sta_config_t
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid));
-  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password));
+  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password) - 1);
 
   // The weakest authmode to accept in the fast scan mode
   if (ap.get_password().empty()) {
@@ -823,7 +823,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
 
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid));
+  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid) - 1);
   conf.ap.channel = ap.get_channel().value_or(1);
   conf.ap.ssid_hidden = ap.get_ssid().size();
   conf.ap.max_connection = 5;
@@ -834,7 +834,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.ap.password = 0;
   } else {
     conf.ap.authmode = WIFI_AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.password));
+    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.password) - 1);
   }
 
   // pairwise cipher of SoftAP, group cipher will be derived using this.

From 9adda8085a4e6868a4a287026ee8a129170ddff7 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Tue, 31 Oct 2023 22:32:29 +0100
Subject: [PATCH 089/131] Remove some explicit IPAddress casts (#5639)

---
 esphome/components/captive_portal/captive_portal.cpp | 2 +-
 esphome/components/mqtt/mqtt_backend_esp8266.h       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/esphome/components/captive_portal/captive_portal.cpp b/esphome/components/captive_portal/captive_portal.cpp
index cc78528e46..78eee4b226 100644
--- a/esphome/components/captive_portal/captive_portal.cpp
+++ b/esphome/components/captive_portal/captive_portal.cpp
@@ -48,7 +48,7 @@ void CaptivePortal::start() {
   this->dns_server_ = make_unique<DNSServer>();
   this->dns_server_->setErrorReplyCode(DNSReplyCode::NoError);
   network::IPAddress ip = wifi::global_wifi_component->wifi_soft_ap_ip();
-  this->dns_server_->start(53, "*", IPAddress(ip));
+  this->dns_server_->start(53, "*", ip);
 #endif
 
   this->base_->get_server()->onNotFound([this](AsyncWebServerRequest *req) {
diff --git a/esphome/components/mqtt/mqtt_backend_esp8266.h b/esphome/components/mqtt/mqtt_backend_esp8266.h
index 981d27693f..06d4993bdf 100644
--- a/esphome/components/mqtt/mqtt_backend_esp8266.h
+++ b/esphome/components/mqtt/mqtt_backend_esp8266.h
@@ -19,7 +19,7 @@ class MQTTBackendESP8266 final : public MQTTBackend {
   void set_will(const char *topic, uint8_t qos, bool retain, const char *payload) final {
     mqtt_client_.setWill(topic, qos, retain, payload);
   }
-  void set_server(network::IPAddress ip, uint16_t port) final { mqtt_client_.setServer(IPAddress(ip), port); }
+  void set_server(network::IPAddress ip, uint16_t port) final { mqtt_client_.setServer(ip, port); }
   void set_server(const char *host, uint16_t port) final { mqtt_client_.setServer(host, port); }
 #if ASYNC_TCP_SSL_ENABLED
   void set_secure(bool secure) { mqtt_client.setSecure(secure); }

From 8eae882d935f7b0f29c8c717f883b465e8d91be3 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:12:16 +1300
Subject: [PATCH 090/131] Add needs-docs workflow to fail CI (#5643)

---
 .github/workflows/needs-docs.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/needs-docs.yml

diff --git a/.github/workflows/needs-docs.yml b/.github/workflows/needs-docs.yml
new file mode 100644
index 0000000000..5019d64752
--- /dev/null
+++ b/.github/workflows/needs-docs.yml
@@ -0,0 +1,24 @@
+name: Needs Docs
+
+on:
+  pull_request:
+    types: [labeled, unlabeled]
+
+jobs:
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check for needs-docs label
+        uses: actions/github-script@v6.4.1
+        with:
+          script: |
+            const { data: labels } = await github.rest.issues.listLabelsOnIssue({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+            const needsDocs = labels.find(label => label.name === 'needs-docs');
+            if (needsDocs) {
+              core.setFailed('Pull request needs docs');
+            }

From 1fd9d67e2b7280035f9435510d717d92725e5573 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Wed, 1 Nov 2023 10:22:04 +1100
Subject: [PATCH 091/131] Add support for PCA9535 16 bit I/O expander (#5634)

---
 CODEOWNERS                             |  2 +-
 esphome/components/pca9554/__init__.py | 38 +++++++++++++++++++++++---
 esphome/components/pca9554/pca9554.cpp | 23 ++++++++++++----
 esphome/components/pca9554/pca9554.h   | 16 +++++++----
 tests/test1.yaml                       |  8 +++++-
 5 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index 9ebc1ac631..38bb21e0ac 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -217,7 +217,7 @@ esphome/components/number/* @esphome/core
 esphome/components/ota/* @esphome/core
 esphome/components/output/* @esphome/core
 esphome/components/pca6416a/* @Mat931
-esphome/components/pca9554/* @hwstar
+esphome/components/pca9554/* @clydebarrow @hwstar
 esphome/components/pcf85063/* @brogon
 esphome/components/pcf8563/* @KoenBreeman
 esphome/components/pid/* @OttoWinter
diff --git a/esphome/components/pca9554/__init__.py b/esphome/components/pca9554/__init__.py
index 76d6ddaf32..a5b4ce492c 100644
--- a/esphome/components/pca9554/__init__.py
+++ b/esphome/components/pca9554/__init__.py
@@ -10,10 +10,12 @@ from esphome.const import (
     CONF_INVERTED,
     CONF_OUTPUT,
 )
+from esphome.core import CORE, ID
 
-CODEOWNERS = ["@hwstar"]
+CODEOWNERS = ["@hwstar", "@clydebarrow"]
 DEPENDENCIES = ["i2c"]
 MULTI_CONF = True
+CONF_PIN_COUNT = "pin_count"
 pca9554_ns = cg.esphome_ns.namespace("pca9554")
 
 PCA9554Component = pca9554_ns.class_("PCA9554Component", cg.Component, i2c.I2CDevice)
@@ -23,7 +25,12 @@ PCA9554GPIOPin = pca9554_ns.class_(
 
 CONF_PCA9554 = "pca9554"
 CONFIG_SCHEMA = (
-    cv.Schema({cv.Required(CONF_ID): cv.declare_id(PCA9554Component)})
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(PCA9554Component),
+            cv.Optional(CONF_PIN_COUNT, default=8): cv.one_of(4, 8, 16),
+        }
+    )
     .extend(cv.COMPONENT_SCHEMA)
     .extend(
         i2c.i2c_device_schema(0x20)
@@ -33,6 +40,7 @@ CONFIG_SCHEMA = (
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
+    cg.add(var.set_pin_count(config[CONF_PIN_COUNT]))
     await cg.register_component(var, config)
     await i2c.register_i2c_device(var, config)
 
@@ -45,11 +53,32 @@ def validate_mode(value):
     return value
 
 
+def validate_pin(config):
+    pca_id = config[CONF_PCA9554].id
+
+    # when pin config validation is performed, the entire YAML has been read, but depending on the component order,
+    # the pca9554 component may not yet have been processed, so its id property could be either the original string,
+    # or an ID object.
+    def matcher(p):
+        id = p[CONF_ID]
+        if isinstance(id, ID):
+            return id.id == pca_id
+        return id == pca_id
+
+    pca = list(filter(matcher, CORE.raw_config[CONF_PCA9554]))
+    if not pca:
+        raise cv.Invalid(f"No pca9554 component found with id matching {pca_id}")
+    count = pca[0][CONF_PIN_COUNT]
+    if config[CONF_NUMBER] >= count:
+        raise cv.Invalid(f"Pin number must be in range 0-{count - 1}")
+    return config
+
+
 PCA9554_PIN_SCHEMA = cv.All(
     {
         cv.GenerateID(): cv.declare_id(PCA9554GPIOPin),
         cv.Required(CONF_PCA9554): cv.use_id(PCA9554Component),
-        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=8),
+        cv.Required(CONF_NUMBER): cv.int_range(min=0, max=15),
         cv.Optional(CONF_MODE, default={}): cv.All(
             {
                 cv.Optional(CONF_INPUT, default=False): cv.boolean,
@@ -58,7 +87,8 @@ PCA9554_PIN_SCHEMA = cv.All(
             validate_mode,
         ),
         cv.Optional(CONF_INVERTED, default=False): cv.boolean,
-    }
+    },
+    validate_pin,
 )
 
 
diff --git a/esphome/components/pca9554/pca9554.cpp b/esphome/components/pca9554/pca9554.cpp
index 74c64dffaa..c5a4bcfb09 100644
--- a/esphome/components/pca9554/pca9554.cpp
+++ b/esphome/components/pca9554/pca9554.cpp
@@ -4,6 +4,7 @@
 namespace esphome {
 namespace pca9554 {
 
+// for 16 bit expanders, these addresses will be doubled.
 const uint8_t INPUT_REG = 0;
 const uint8_t OUTPUT_REG = 1;
 const uint8_t INVERT_REG = 2;
@@ -13,9 +14,10 @@ static const char *const TAG = "pca9554";
 
 void PCA9554Component::setup() {
   ESP_LOGCONFIG(TAG, "Setting up PCA9554/PCA9554A...");
+  this->reg_width_ = (this->pin_count_ + 7) / 8;
   // Test to see if device exists
   if (!this->read_inputs_()) {
-    ESP_LOGE(TAG, "PCA9554 not available under 0x%02X", this->address_);
+    ESP_LOGE(TAG, "PCA95xx not detected at 0x%02X", this->address_);
     this->mark_failed();
     return;
   }
@@ -44,6 +46,7 @@ void PCA9554Component::loop() {
 
 void PCA9554Component::dump_config() {
   ESP_LOGCONFIG(TAG, "PCA9554:");
+  ESP_LOGCONFIG(TAG, "  I/O Pins: %d", this->pin_count_);
   LOG_I2C_DEVICE(this)
   if (this->is_failed()) {
     ESP_LOGE(TAG, "Communication with PCA9554 failed!");
@@ -85,25 +88,33 @@ void PCA9554Component::pin_mode(uint8_t pin, gpio::Flags flags) {
 }
 
 bool PCA9554Component::read_inputs_() {
-  uint8_t inputs;
+  uint8_t inputs[2];
 
   if (this->is_failed()) {
     ESP_LOGD(TAG, "Device marked failed");
     return false;
   }
 
-  if ((this->last_error_ = this->read_register(INPUT_REG, &inputs, 1, true)) != esphome::i2c::ERROR_OK) {
+  if ((this->last_error_ = this->read_register(INPUT_REG * this->reg_width_, inputs, this->reg_width_, true)) !=
+      esphome::i2c::ERROR_OK) {
     this->status_set_warning();
     ESP_LOGE(TAG, "read_register_(): I2C I/O error: %d", (int) this->last_error_);
     return false;
   }
   this->status_clear_warning();
-  this->input_mask_ = inputs;
+  this->input_mask_ = inputs[0];
+  if (this->reg_width_ == 2) {
+    this->input_mask_ |= inputs[1] << 8;
+  }
   return true;
 }
 
-bool PCA9554Component::write_register_(uint8_t reg, uint8_t value) {
-  if ((this->last_error_ = this->write_register(reg, &value, 1, true)) != esphome::i2c::ERROR_OK) {
+bool PCA9554Component::write_register_(uint8_t reg, uint16_t value) {
+  uint8_t outputs[2];
+  outputs[0] = (uint8_t) value;
+  outputs[1] = (uint8_t) (value >> 8);
+  if ((this->last_error_ = this->write_register(reg * this->reg_width_, outputs, this->reg_width_, true)) !=
+      esphome::i2c::ERROR_OK) {
     this->status_set_warning();
     ESP_LOGE(TAG, "write_register_(): I2C I/O error: %d", (int) this->last_error_);
     return false;
diff --git a/esphome/components/pca9554/pca9554.h b/esphome/components/pca9554/pca9554.h
index c2aa5c30ed..c548bec619 100644
--- a/esphome/components/pca9554/pca9554.h
+++ b/esphome/components/pca9554/pca9554.h
@@ -28,19 +28,25 @@ class PCA9554Component : public Component, public i2c::I2CDevice {
 
   void dump_config() override;
 
+  void set_pin_count(size_t pin_count) { this->pin_count_ = pin_count; }
+
  protected:
   bool read_inputs_();
 
-  bool write_register_(uint8_t reg, uint8_t value);
+  bool write_register_(uint8_t reg, uint16_t value);
 
+  /// number of bits the expander has
+  size_t pin_count_{8};
+  /// width of registers
+  size_t reg_width_{1};
   /// Mask for the pin config - 1 means OUTPUT, 0 means INPUT
-  uint8_t config_mask_{0x00};
+  uint16_t config_mask_{0x00};
   /// The mask to write as output state - 1 means HIGH, 0 means LOW
-  uint8_t output_mask_{0x00};
+  uint16_t output_mask_{0x00};
   /// The state of the actual input pin states - 1 means HIGH, 0 means LOW
-  uint8_t input_mask_{0x00};
+  uint16_t input_mask_{0x00};
   /// Flags to check if read previously during this loop
-  uint8_t was_previously_read_ = {0x00};
+  uint16_t was_previously_read_ = {0x00};
   /// Storage for last I2C error seen
   esphome::i2c::ErrorCode last_error_;
 };
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 462b1ec197..1498dac69d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -3182,6 +3182,7 @@ pcf8574:
 
 pca9554:
   - id: pca9554_hub
+    pin_count: 8
     address: 0x3F
     i2c_id: i2c_bus
 
@@ -3331,7 +3332,12 @@ rtttl:
 canbus:
   - platform: mcp2515
     id: mcp2515_can
-    cs_pin: GPIO17
+    cs_pin:
+      pca9554: pca9554_hub
+      number: 7
+      mode:
+        output: true
+      inverted: true
     can_id: 4
     bit_rate: 50kbps
     on_frame:

From 40c001bdc2f3f71d71a5d1294f4a7440cf0adfe5 Mon Sep 17 00:00:00 2001
From: Gustavo Ambrozio <gustavo@gustavo.eng.br>
Date: Wed, 1 Nov 2023 15:09:12 -1000
Subject: [PATCH 092/131] Fix nextion waveform sending for multiple waveforms
 (#4408)

---
 esphome/components/nextion/nextion.cpp        | 107 +++++++-----------
 esphome/components/nextion/nextion.h          |   3 +
 .../nextion/nextion_component_base.h          |   7 ++
 3 files changed, 54 insertions(+), 63 deletions(-)

diff --git a/esphome/components/nextion/nextion.cpp b/esphome/components/nextion/nextion.cpp
index 6133ad1d7e..78c07be890 100644
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -116,6 +116,7 @@ void Nextion::reset_(bool reset_nextion) {
     this->read_byte(&d);
   };
   this->nextion_queue_.clear();
+  this->waveform_queue_.clear();
 }
 
 void Nextion::dump_config() {
@@ -364,37 +365,21 @@ void Nextion::process_nextion_commands_() {
         ESP_LOGW(TAG, "Nextion reported baud rate invalid!");
         break;
       case 0x12:  // invalid Waveform ID or Channel # was used
+        if (this->waveform_queue_.empty()) {
+          ESP_LOGW(TAG,
+                   "Nextion reported invalid Waveform ID or Channel # was used but no waveform sensor in queue found!");
+        } else {
+          auto &nb = this->waveform_queue_.front();
+          NextionComponentBase *component = nb->component;
 
-        if (!this->nextion_queue_.empty()) {
-          int index = 0;
-          int found = -1;
-          for (auto &nb : this->nextion_queue_) {
-            NextionComponentBase *component = nb->component;
+          ESP_LOGW(TAG, "Nextion reported invalid Waveform ID %d or Channel # %d was used!",
+                   component->get_component_id(), component->get_wave_channel_id());
 
-            if (component->get_queue_type() == NextionQueueType::WAVEFORM_SENSOR) {
-              ESP_LOGW(TAG, "Nextion reported invalid Waveform ID %d or Channel # %d was used!",
-                       component->get_component_id(), component->get_wave_channel_id());
+          ESP_LOGN(TAG, "Removing waveform from queue with component id %d and waveform id %d",
+                   component->get_component_id(), component->get_wave_channel_id());
 
-              ESP_LOGN(TAG, "Removing waveform from queue with component id %d and waveform id %d",
-                       component->get_component_id(), component->get_wave_channel_id());
-
-              found = index;
-
-              delete component;  // NOLINT(cppcoreguidelines-owning-memory)
-              delete nb;         // NOLINT(cppcoreguidelines-owning-memory)
-
-              break;
-            }
-            ++index;
-          }
-
-          if (found != -1) {
-            this->nextion_queue_.erase(this->nextion_queue_.begin() + found);
-          } else {
-            ESP_LOGW(
-                TAG,
-                "Nextion reported invalid Waveform ID or Channel # was used but no waveform sensor in queue found!");
-          }
+          delete nb;  // NOLINT(cppcoreguidelines-owning-memory)
+          this->waveform_queue_.pop_front();
         }
         break;
       case 0x1A:  // variable name invalid
@@ -697,44 +682,29 @@ void Nextion::process_nextion_commands_() {
       }
       case 0xFD: {  // data transparent transmit finished
         ESP_LOGVV(TAG, "Nextion reported data transmit finished!");
+        this->check_pending_waveform_();
         break;
       }
       case 0xFE: {  // data transparent transmit ready
         ESP_LOGVV(TAG, "Nextion reported ready for transmit!");
-
-        int index = 0;
-        int found = -1;
-        for (auto &nb : this->nextion_queue_) {
-          auto *component = nb->component;
-          if (component->get_queue_type() == NextionQueueType::WAVEFORM_SENSOR) {
-            size_t buffer_to_send = component->get_wave_buffer().size() < 255 ? component->get_wave_buffer().size()
-                                                                              : 255;  // ADDT command can only send 255
-
-            this->write_array(component->get_wave_buffer().data(), static_cast<int>(buffer_to_send));
-
-            ESP_LOGN(TAG, "Nextion sending waveform data for component id %d and waveform id %d, size %zu",
-                     component->get_component_id(), component->get_wave_channel_id(), buffer_to_send);
-
-            if (component->get_wave_buffer().size() <= 255) {
-              component->get_wave_buffer().clear();
-            } else {
-              component->get_wave_buffer().erase(component->get_wave_buffer().begin(),
-                                                 component->get_wave_buffer().begin() + buffer_to_send);
-            }
-            found = index;
-            delete component;  // NOLINT(cppcoreguidelines-owning-memory)
-            delete nb;         // NOLINT(cppcoreguidelines-owning-memory)
-            break;
-          }
-          ++index;
-        }
-
-        if (found == -1) {
+        if (this->waveform_queue_.empty()) {
           ESP_LOGE(TAG, "No waveforms in queue to send data!");
           break;
-        } else {
-          this->nextion_queue_.erase(this->nextion_queue_.begin() + found);
         }
+
+        auto &nb = this->waveform_queue_.front();
+        auto *component = nb->component;
+        size_t buffer_to_send = component->get_wave_buffer_size() < 255 ? component->get_wave_buffer_size()
+                                                                        : 255;  // ADDT command can only send 255
+
+        this->write_array(component->get_wave_buffer().data(), static_cast<int>(buffer_to_send));
+
+        ESP_LOGN(TAG, "Nextion sending waveform data for component id %d and waveform id %d, size %zu",
+                 component->get_component_id(), component->get_wave_channel_id(), buffer_to_send);
+
+        component->clear_wave_buffer(buffer_to_send);
+        delete nb;  // NOLINT(cppcoreguidelines-owning-memory)
+        this->waveform_queue_.pop_front();
         break;
       }
       default:
@@ -1093,17 +1063,28 @@ void Nextion::add_addt_command_to_queue(NextionComponentBase *component) {
   // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
   nextion::NextionQueue *nextion_queue = new nextion::NextionQueue;
 
-  // NOLINTNEXTLINE(cppcoreguidelines-owning-memory)
-  nextion_queue->component = new nextion::NextionComponentBase;
+  nextion_queue->component = component;
   nextion_queue->queue_time = millis();
 
+  this->waveform_queue_.push_back(nextion_queue);
+  if (this->waveform_queue_.size() == 1)
+    this->check_pending_waveform_();
+}
+
+void Nextion::check_pending_waveform_() {
+  if (this->waveform_queue_.empty())
+    return;
+
+  auto *nb = this->waveform_queue_.front();
+  auto *component = nb->component;
   size_t buffer_to_send = component->get_wave_buffer_size() < 255 ? component->get_wave_buffer_size()
                                                                   : 255;  // ADDT command can only send 255
 
   std::string command = "addt " + to_string(component->get_component_id()) + "," +
                         to_string(component->get_wave_channel_id()) + "," + to_string(buffer_to_send);
-  if (this->send_command_(command)) {
-    this->nextion_queue_.push_back(nextion_queue);
+  if (!this->send_command_(command)) {
+    delete nb;  // NOLINT(cppcoreguidelines-owning-memory)
+    this->waveform_queue_.pop_front();
   }
 }
 
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 7518d7f4cb..92ff3fe235 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -740,6 +740,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
 
  protected:
   std::deque<NextionQueue *> nextion_queue_;
+  std::deque<NextionQueue *> waveform_queue_;
   uint16_t recv_ret_string_(std::string &response, uint32_t timeout, bool recv_flag);
   void all_components_send_state_(bool force_update = false);
   uint64_t comok_sent_ = 0;
@@ -780,6 +781,8 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
                                                  const std::string &variable_name_to_send,
                                                  const std::string &state_value, bool is_sleep_safe = false);
 
+  void check_pending_waveform_();
+
 #ifdef USE_NEXTION_TFT_UPLOAD
 #ifdef USE_ESP8266
   WiFiClient *wifi_client_{nullptr};
diff --git a/esphome/components/nextion/nextion_component_base.h b/esphome/components/nextion/nextion_component_base.h
index e0ef8f93bc..42e1b00998 100644
--- a/esphome/components/nextion/nextion_component_base.h
+++ b/esphome/components/nextion/nextion_component_base.h
@@ -69,6 +69,13 @@ class NextionComponentBase {
 
   std::vector<uint8_t> get_wave_buffer() { return this->wave_buffer_; }
   size_t get_wave_buffer_size() { return this->wave_buffer_.size(); }
+  void clear_wave_buffer(size_t buffer_sent) {
+    if (this->wave_buffer_.size() <= buffer_sent) {
+      this->wave_buffer_.clear();
+    } else {
+      this->wave_buffer_.erase(this->wave_buffer_.begin(), this->wave_buffer_.begin() + buffer_sent);
+    }
+  }
 
   std::string get_variable_name() { return this->variable_name_; }
   std::string get_variable_name_to_send() { return this->variable_name_to_send_; }

From 9eea52ea8513aac64fc21b470b3a1f5fda68d080 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:32:00 +1300
Subject: [PATCH 093/131] Allow validation of pins based on hub config (#5647)

---
 esphome/components/pca6416a/__init__.py  |  2 +-
 esphome/components/pca9554/__init__.py   |  2 +-
 esphome/components/pcf8574/__init__.py   |  2 +-
 esphome/components/sn74hc165/__init__.py | 10 ++++++-
 esphome/config.py                        | 36 ++++++++++++++++++++----
 esphome/cpp_helpers.py                   |  2 +-
 esphome/pins.py                          |  4 +--
 esphome/util.py                          | 26 +++++++++++++++++
 8 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/esphome/components/pca6416a/__init__.py b/esphome/components/pca6416a/__init__.py
index 574d8dce91..93be148169 100644
--- a/esphome/components/pca6416a/__init__.py
+++ b/esphome/components/pca6416a/__init__.py
@@ -64,7 +64,7 @@ PCA6416A_PIN_SCHEMA = cv.All(
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register("pca6416a", PCA6416A_PIN_SCHEMA)
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_PCA6416A, PCA6416A_PIN_SCHEMA)
 async def pca6416a_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCA6416A])
diff --git a/esphome/components/pca9554/__init__.py b/esphome/components/pca9554/__init__.py
index a5b4ce492c..4abb2c1703 100644
--- a/esphome/components/pca9554/__init__.py
+++ b/esphome/components/pca9554/__init__.py
@@ -92,7 +92,7 @@ PCA9554_PIN_SCHEMA = cv.All(
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register("pca9554", PCA9554_PIN_SCHEMA)
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_PCA9554, PCA9554_PIN_SCHEMA)
 async def pca9554_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCA9554])
diff --git a/esphome/components/pcf8574/__init__.py b/esphome/components/pcf8574/__init__.py
index a5f963707f..d44ac28364 100644
--- a/esphome/components/pcf8574/__init__.py
+++ b/esphome/components/pcf8574/__init__.py
@@ -65,7 +65,7 @@ PCF8574_PIN_SCHEMA = cv.All(
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register("pcf8574", PCF8574_PIN_SCHEMA)
+@pins.PIN_SCHEMA_REGISTRY.register(CONF_PCF8574, PCF8574_PIN_SCHEMA)
 async def pcf8574_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCF8574])
diff --git a/esphome/components/sn74hc165/__init__.py b/esphome/components/sn74hc165/__init__.py
index 85d0220a88..0f2abd3678 100644
--- a/esphome/components/sn74hc165/__init__.py
+++ b/esphome/components/sn74hc165/__init__.py
@@ -77,7 +77,15 @@ SN74HC165_PIN_SCHEMA = cv.All(
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register(CONF_SN74HC165, SN74HC165_PIN_SCHEMA)
+def sn74hc165_pin_final_validate(pin_config, parent_config):
+    max_pins = parent_config[CONF_SR_COUNT] * 8
+    if pin_config[CONF_NUMBER] >= max_pins:
+        raise cv.Invalid(f"Pin number must be less than {max_pins}")
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(
+    CONF_SN74HC165, SN74HC165_PIN_SCHEMA, sn74hc165_pin_final_validate
+)
 async def sn74hc165_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_SN74HC165])
diff --git a/esphome/config.py b/esphome/config.py
index b04de020e0..a980358186 100644
--- a/esphome/config.py
+++ b/esphome/config.py
@@ -10,7 +10,7 @@ from contextlib import contextmanager
 
 import voluptuous as vol
 
-from esphome import core, yaml_util, loader
+from esphome import core, yaml_util, loader, pins
 import esphome.core.config as core_config
 from esphome.const import (
     CONF_ESPHOME,
@@ -645,14 +645,40 @@ class FinalValidateValidationStep(ConfigValidationStep):
             # If result already has errors, skip this step
             return
 
-        if self.comp.final_validate_schema is None:
-            return
-
         token = fv.full_config.set(result)
 
         conf = result.get_nested_item(self.path)
         with result.catch_error(self.path):
-            self.comp.final_validate_schema(conf)
+            if self.comp.final_validate_schema is not None:
+                self.comp.final_validate_schema(conf)
+
+            fconf = fv.full_config.get()
+
+            def _check_pins(c):
+                for value in c.values():
+                    if not isinstance(value, dict):
+                        continue
+                    for key, (
+                        _,
+                        _,
+                        pin_final_validate,
+                    ) in pins.PIN_SCHEMA_REGISTRY.items():
+                        if (
+                            key != CORE.target_platform
+                            and key in value
+                            and pin_final_validate is not None
+                        ):
+                            pin_final_validate(fconf, value)
+
+            # Check for pin configs and a final_validate schema in the pin registry
+            confs = conf
+            if not isinstance(
+                confs, list
+            ):  # Handle components like SPI that have a list instead of MULTI_CONF
+                confs = [conf]
+            for c in confs:
+                if c:  # Some component have None or empty schemas
+                    _check_pins(c)
 
         fv.full_config.reset(token)
 
diff --git a/esphome/cpp_helpers.py b/esphome/cpp_helpers.py
index cc53f491f5..4b3716e223 100644
--- a/esphome/cpp_helpers.py
+++ b/esphome/cpp_helpers.py
@@ -35,7 +35,7 @@ async def gpio_pin_expression(conf):
         return None
     from esphome import pins
 
-    for key, (func, _) in pins.PIN_SCHEMA_REGISTRY.items():
+    for key, (func, _, _) in pins.PIN_SCHEMA_REGISTRY.items():
         if key in conf:
             return await coroutine(func)(conf)
     return await coroutine(pins.PIN_SCHEMA_REGISTRY[CORE.target_platform][0])(conf)
diff --git a/esphome/pins.py b/esphome/pins.py
index cec715b922..0035bea4f0 100644
--- a/esphome/pins.py
+++ b/esphome/pins.py
@@ -11,10 +11,10 @@ from esphome.const import (
     CONF_PULLUP,
     CONF_IGNORE_STRAPPING_WARNING,
 )
-from esphome.util import SimpleRegistry
+from esphome.util import PinRegistry
 from esphome.core import CORE
 
-PIN_SCHEMA_REGISTRY = SimpleRegistry()
+PIN_SCHEMA_REGISTRY = PinRegistry()
 
 
 def _set_mode(value, default_mode):
diff --git a/esphome/util.py b/esphome/util.py
index 480618aca0..ab9fa82414 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -57,6 +57,32 @@ class SimpleRegistry(dict):
         return decorator
 
 
+def _final_validate(parent_id_key, fun):
+    def validator(fconf, pin_config):
+        import esphome.config_validation as cv
+
+        parent_path = fconf.get_path_for_id(pin_config[parent_id_key])[:-1]
+        parent_config = fconf.get_config_for_path(parent_path)
+
+        pin_path = fconf.get_path_for_id(pin_config[const.CONF_ID])[:-1]
+        with cv.prepend_path([cv.ROOT_CONFIG_PATH] + pin_path):
+            fun(pin_config, parent_config)
+
+    return validator
+
+
+class PinRegistry(dict):
+    def register(self, name, schema, final_validate=None):
+        if final_validate is not None:
+            final_validate = _final_validate(name, final_validate)
+
+        def decorator(fun):
+            self[name] = (fun, schema, final_validate)
+            return fun
+
+        return decorator
+
+
 def safe_print(message="", end="\n"):
     from esphome.core import CORE
 

From c3f7cae2b061695de3707a969e061a69f214904f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 15:49:16 +1300
Subject: [PATCH 094/131] Bump aioesphomeapi from 18.2.0 to 18.2.1 (#5653)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 314f3b453f..08e278fe53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
-aioesphomeapi==18.2.0
+aioesphomeapi==18.2.1
 zeroconf==0.119.0
 
 # esp-idf requires this, but doesn't bundle it by default

From 29b1233609fd0cf7e4b756149ac669d0d36c967e Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:45:00 +1300
Subject: [PATCH 095/131] Validate sn74hc595 pin number are within range
 (#5655)

---
 esphome/components/sn74hc595/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/esphome/components/sn74hc595/__init__.py b/esphome/components/sn74hc595/__init__.py
index 92b6d8d0e5..e98da72304 100644
--- a/esphome/components/sn74hc595/__init__.py
+++ b/esphome/components/sn74hc595/__init__.py
@@ -75,7 +75,15 @@ SN74HC595_PIN_SCHEMA = cv.All(
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register(CONF_SN74HC595, SN74HC595_PIN_SCHEMA)
+def sn74hc595_pin_final_validate(pin_config, parent_config):
+    max_pins = parent_config[CONF_SR_COUNT] * 8
+    if pin_config[CONF_NUMBER] >= max_pins:
+        raise cv.Invalid(f"Pin number must be less than {max_pins}")
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(
+    CONF_SN74HC595, SN74HC595_PIN_SCHEMA, sn74hc595_pin_final_validate
+)
 async def sn74hc595_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_parented(var, config[CONF_SN74HC595])

From b0a400d82bcec91b41717b97b06c455a1e5c1f49 Mon Sep 17 00:00:00 2001
From: Clyde Stubbs <2366188+clydebarrow@users.noreply.github.com>
Date: Thu, 2 Nov 2023 14:46:47 +1100
Subject: [PATCH 096/131] Update PCA9554 pin checks to new facility (#5656)

---
 esphome/components/pca9554/__init__.py | 33 +++++++-------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/esphome/components/pca9554/__init__.py b/esphome/components/pca9554/__init__.py
index 4abb2c1703..fd52fafc5d 100644
--- a/esphome/components/pca9554/__init__.py
+++ b/esphome/components/pca9554/__init__.py
@@ -10,7 +10,6 @@ from esphome.const import (
     CONF_INVERTED,
     CONF_OUTPUT,
 )
-from esphome.core import CORE, ID
 
 CODEOWNERS = ["@hwstar", "@clydebarrow"]
 DEPENDENCIES = ["i2c"]
@@ -53,27 +52,6 @@ def validate_mode(value):
     return value
 
 
-def validate_pin(config):
-    pca_id = config[CONF_PCA9554].id
-
-    # when pin config validation is performed, the entire YAML has been read, but depending on the component order,
-    # the pca9554 component may not yet have been processed, so its id property could be either the original string,
-    # or an ID object.
-    def matcher(p):
-        id = p[CONF_ID]
-        if isinstance(id, ID):
-            return id.id == pca_id
-        return id == pca_id
-
-    pca = list(filter(matcher, CORE.raw_config[CONF_PCA9554]))
-    if not pca:
-        raise cv.Invalid(f"No pca9554 component found with id matching {pca_id}")
-    count = pca[0][CONF_PIN_COUNT]
-    if config[CONF_NUMBER] >= count:
-        raise cv.Invalid(f"Pin number must be in range 0-{count - 1}")
-    return config
-
-
 PCA9554_PIN_SCHEMA = cv.All(
     {
         cv.GenerateID(): cv.declare_id(PCA9554GPIOPin),
@@ -88,11 +66,18 @@ PCA9554_PIN_SCHEMA = cv.All(
         ),
         cv.Optional(CONF_INVERTED, default=False): cv.boolean,
     },
-    validate_pin,
 )
 
 
-@pins.PIN_SCHEMA_REGISTRY.register(CONF_PCA9554, PCA9554_PIN_SCHEMA)
+def pca9554_pin_final_validate(pin_config, parent_config):
+    count = parent_config[CONF_PIN_COUNT]
+    if pin_config[CONF_NUMBER] >= count:
+        raise cv.Invalid(f"Pin number must be in range 0-{count - 1}")
+
+
+@pins.PIN_SCHEMA_REGISTRY.register(
+    CONF_PCA9554, PCA9554_PIN_SCHEMA, pca9554_pin_final_validate
+)
 async def pca9554_pin_to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     parent = await cg.get_variable(config[CONF_PCA9554])

From f70d651a39988aa891391aff54cf06e685a1c880 Mon Sep 17 00:00:00 2001
From: Jimmy Hedman <jimmy.hedman@gmail.com>
Date: Thu, 2 Nov 2023 04:56:02 +0100
Subject: [PATCH 097/131] Update mDNS component to 1.2.2 (#5654)

---
 esphome/components/mdns/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/mdns/__init__.py b/esphome/components/mdns/__init__.py
index fbe1e1a719..9efefd58cc 100644
--- a/esphome/components/mdns/__init__.py
+++ b/esphome/components/mdns/__init__.py
@@ -88,7 +88,7 @@ async def to_code(config):
         add_idf_component(
             name="mdns",
             repo="https://github.com/espressif/esp-protocols.git",
-            ref="mdns-v1.2.0",
+            ref="mdns-v1.2.2",
             path="components/mdns",
         )
 

From 4edf3efdf3200606313e7882078d7faea7153816 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:06:09 +1300
Subject: [PATCH 098/131] Fix return value of run_external_command (#5657)

---
 esphome/util.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/esphome/util.py b/esphome/util.py
index ab9fa82414..d9c8502e0e 100644
--- a/esphome/util.py
+++ b/esphome/util.py
@@ -222,7 +222,7 @@ def run_external_command(
     try:
         sys.argv = list(cmd)
         sys.exit = mock_exit
-        return func() or 0
+        retval = func() or 0
     except KeyboardInterrupt:  # pylint: disable=try-except-raise
         raise
     except SystemExit as err:
@@ -238,9 +238,10 @@ def run_external_command(
         sys.stdout = orig_stdout
         sys.stderr = orig_stderr
 
-        if capture_stdout:
-            # pylint: disable=lost-exception
-            return cap_stdout.getvalue()
+    if capture_stdout:
+        return cap_stdout.getvalue()
+
+    return retval
 
 
 def run_external_process(*cmd, **kwargs):

From 453600f18e4e55f8a5ea60f626f3fba4a00576b6 Mon Sep 17 00:00:00 2001
From: NP v/d Spek <github_mail@lumensoft.nl>
Date: Thu, 2 Nov 2023 05:14:05 +0100
Subject: [PATCH 099/131] Update RTTTL component to allow I2S (#5177)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/rtttl/__init__.py |  52 +++++--
 esphome/components/rtttl/rtttl.cpp   | 218 ++++++++++++++++++++-------
 esphome/components/rtttl/rtttl.h     |  55 +++++--
 3 files changed, 245 insertions(+), 80 deletions(-)

diff --git a/esphome/components/rtttl/__init__.py b/esphome/components/rtttl/__init__.py
index e9453896ac..6163129529 100644
--- a/esphome/components/rtttl/__init__.py
+++ b/esphome/components/rtttl/__init__.py
@@ -4,7 +4,15 @@ import esphome.config_validation as cv
 import esphome.final_validate as fv
 from esphome import automation
 from esphome.components.output import FloatOutput
-from esphome.const import CONF_ID, CONF_OUTPUT, CONF_PLATFORM, CONF_TRIGGER_ID
+from esphome.components.speaker import Speaker
+
+from esphome.const import (
+    CONF_ID,
+    CONF_OUTPUT,
+    CONF_PLATFORM,
+    CONF_TRIGGER_ID,
+    CONF_SPEAKER,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,17 +32,23 @@ IsPlayingCondition = rtttl_ns.class_("IsPlayingCondition", automation.Condition)
 
 MULTI_CONF = True
 
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.GenerateID(CONF_ID): cv.declare_id(Rtttl),
-        cv.Required(CONF_OUTPUT): cv.use_id(FloatOutput),
-        cv.Optional(CONF_ON_FINISHED_PLAYBACK): automation.validate_automation(
-            {
-                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(FinishedPlaybackTrigger),
-            }
-        ),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(CONF_ID): cv.declare_id(Rtttl),
+            cv.Optional(CONF_OUTPUT): cv.use_id(FloatOutput),
+            cv.Optional(CONF_SPEAKER): cv.use_id(Speaker),
+            cv.Optional(CONF_ON_FINISHED_PLAYBACK): automation.validate_automation(
+                {
+                    cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(
+                        FinishedPlaybackTrigger
+                    ),
+                }
+            ),
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    cv.has_exactly_one_key(CONF_OUTPUT, CONF_SPEAKER),
+)
 
 
 def validate_parent_output_config(value):
@@ -63,9 +77,9 @@ def validate_parent_output_config(value):
 
 FINAL_VALIDATE_SCHEMA = cv.Schema(
     {
-        cv.Required(CONF_OUTPUT): fv.id_declaration_match_schema(
+        cv.Optional(CONF_OUTPUT): fv.id_declaration_match_schema(
             validate_parent_output_config
-        )
+        ),
     },
     extra=cv.ALLOW_EXTRA,
 )
@@ -75,8 +89,14 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
 
-    out = await cg.get_variable(config[CONF_OUTPUT])
-    cg.add(var.set_output(out))
+    if CONF_OUTPUT in config:
+        out = await cg.get_variable(config[CONF_OUTPUT])
+        cg.add(var.set_output(out))
+        cg.add_define("USE_OUTPUT")
+
+    if CONF_SPEAKER in config:
+        out = await cg.get_variable(config[CONF_SPEAKER])
+        cg.add(var.set_speaker(out))
 
     for conf in config.get(CONF_ON_FINISHED_PLAYBACK, []):
         trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
diff --git a/esphome/components/rtttl/rtttl.cpp b/esphome/components/rtttl/rtttl.cpp
index 6274e69ba3..199a373785 100644
--- a/esphome/components/rtttl/rtttl.cpp
+++ b/esphome/components/rtttl/rtttl.cpp
@@ -1,4 +1,5 @@
 #include "rtttl.h"
+#include <cmath>
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
 
@@ -15,104 +16,185 @@ static const uint16_t NOTES[] = {0,    262,  277,  294,  311,  330,  349,  370,
                                  1109, 1175, 1245, 1319, 1397, 1480, 1568, 1661, 1760, 1865, 1976, 2093, 2217,
                                  2349, 2489, 2637, 2794, 2960, 3136, 3322, 3520, 3729, 3951};
 
+static const uint16_t I2S_SPEED = 1600;
+
+#undef HALF_PI
+static const double HALF_PI = 1.5707963267948966192313216916398;
+
+inline double deg2rad(double degrees) {
+  static const double PI_ON_180 = 4.0 * atan(1.0) / 180.0;
+  return degrees * PI_ON_180;
+}
+
 void Rtttl::dump_config() { ESP_LOGCONFIG(TAG, "Rtttl"); }
 
 void Rtttl::play(std::string rtttl) {
-  rtttl_ = std::move(rtttl);
+  this->rtttl_ = std::move(rtttl);
+
+  this->default_duration_ = 4;
+  this->default_octave_ = 6;
+  this->note_duration_ = 0;
 
-  default_duration_ = 4;
-  default_octave_ = 6;
   int bpm = 63;
   uint8_t num;
 
   // Get name
-  position_ = rtttl_.find(':');
+  this->position_ = rtttl_.find(':');
 
   // it's somewhat documented to be up to 10 characters but let's be a bit flexible here
-  if (position_ == std::string::npos || position_ > 15) {
+  if (this->position_ == std::string::npos || this->position_ > 15) {
     ESP_LOGE(TAG, "Missing ':' when looking for name.");
     return;
   }
 
-  auto name = this->rtttl_.substr(0, position_);
+  auto name = this->rtttl_.substr(0, this->position_);
   ESP_LOGD(TAG, "Playing song %s", name.c_str());
 
   // get default duration
-  position_ = this->rtttl_.find("d=", position_);
-  if (position_ == std::string::npos) {
+  this->position_ = this->rtttl_.find("d=", this->position_);
+  if (this->position_ == std::string::npos) {
     ESP_LOGE(TAG, "Missing 'd='");
     return;
   }
-  position_ += 2;
+  this->position_ += 2;
   num = this->get_integer_();
   if (num > 0)
-    default_duration_ = num;
+    this->default_duration_ = num;
 
   // get default octave
-  position_ = rtttl_.find("o=", position_);
-  if (position_ == std::string::npos) {
+  this->position_ = this->rtttl_.find("o=", this->position_);
+  if (this->position_ == std::string::npos) {
     ESP_LOGE(TAG, "Missing 'o=");
     return;
   }
-  position_ += 2;
+  this->position_ += 2;
   num = get_integer_();
   if (num >= 3 && num <= 7)
-    default_octave_ = num;
+    this->default_octave_ = num;
 
   // get BPM
-  position_ = rtttl_.find("b=", position_);
-  if (position_ == std::string::npos) {
+  this->position_ = this->rtttl_.find("b=", this->position_);
+  if (this->position_ == std::string::npos) {
     ESP_LOGE(TAG, "Missing b=");
     return;
   }
-  position_ += 2;
+  this->position_ += 2;
   num = get_integer_();
   if (num != 0)
     bpm = num;
 
-  position_ = rtttl_.find(':', position_);
-  if (position_ == std::string::npos) {
+  this->position_ = this->rtttl_.find(':', this->position_);
+  if (this->position_ == std::string::npos) {
     ESP_LOGE(TAG, "Missing second ':'");
     return;
   }
-  position_++;
+  this->position_++;
 
   // BPM usually expresses the number of quarter notes per minute
-  wholenote_ = 60 * 1000L * 4 / bpm;  // this is the time for whole note (in milliseconds)
+  this->wholenote_ = 60 * 1000L * 4 / bpm;  // this is the time for whole note (in milliseconds)
 
-  output_freq_ = 0;
-  last_note_ = millis();
-  note_duration_ = 1;
+  this->output_freq_ = 0;
+  this->last_note_ = millis();
+  this->note_duration_ = 1;
+
+#ifdef USE_SPEAKER
+  this->samples_sent_ = 0;
+  this->samples_count_ = 0;
+#endif
+}
+
+void Rtttl::stop() {
+  this->note_duration_ = 0;
+#ifdef USE_OUTPUT
+  if (this->output_ != nullptr) {
+    this->output_->set_level(0.0);
+  }
+#endif
+#ifdef USE_SPEAKER
+  if (this->speaker_ != nullptr) {
+    if (this->speaker_->is_running()) {
+      this->speaker_->stop();
+    }
+  }
+#endif
 }
 
 void Rtttl::loop() {
-  if (note_duration_ == 0 || millis() - last_note_ < note_duration_)
+  if (this->note_duration_ == 0)
     return;
 
-  if (!rtttl_[position_]) {
-    output_->set_level(0.0);
+#ifdef USE_SPEAKER
+  if (this->speaker_ != nullptr) {
+    if (this->samples_sent_ != this->samples_count_) {
+      SpeakerSample sample[SAMPLE_BUFFER_SIZE + 1];
+      int x = 0;
+      double rem = 0.0;
+
+      while (true) {
+        // Try and send out the remainder of the existing note, one per loop()
+
+        if (this->samples_per_wave_ != 0 && this->samples_sent_ >= this->samples_gap_) {  // Play note//
+          rem = ((this->samples_sent_ << 10) % this->samples_per_wave_) * (360.0 / this->samples_per_wave_);
+
+          int16_t val = 8192 * sin(deg2rad(rem));
+
+          sample[x].left = val;
+          sample[x].right = val;
+
+        } else {
+          sample[x].left = 0;
+          sample[x].right = 0;
+        }
+
+        if (x >= SAMPLE_BUFFER_SIZE || this->samples_sent_ >= this->samples_count_) {
+          break;
+        }
+        this->samples_sent_++;
+        x++;
+      }
+      if (x > 0) {
+        int send = this->speaker_->play((uint8_t *) (&sample), x * 4);
+        if (send != x * 4) {
+          this->samples_sent_ -= (x - (send / 4));
+        }
+        return;
+      }
+    }
+  }
+#endif
+#ifdef USE_OUTPUT
+  if (this->output_ != nullptr && millis() - this->last_note_ < this->note_duration_)
+    return;
+#endif
+  if (!this->rtttl_[position_]) {
+    this->note_duration_ = 0;
+#ifdef USE_OUTPUT
+    if (this->output_ != nullptr) {
+      this->output_->set_level(0.0);
+    }
+#endif
     ESP_LOGD(TAG, "Playback finished");
     this->on_finished_playback_callback_.call();
-    note_duration_ = 0;
     return;
   }
 
   // align to note: most rtttl's out there does not add and space after the ',' separator but just in case...
-  while (rtttl_[position_] == ',' || rtttl_[position_] == ' ')
-    position_++;
+  while (this->rtttl_[this->position_] == ',' || this->rtttl_[this->position_] == ' ')
+    this->position_++;
 
   // first, get note duration, if available
   uint8_t num = this->get_integer_();
 
   if (num) {
-    note_duration_ = wholenote_ / num;
+    this->note_duration_ = this->wholenote_ / num;
   } else {
-    note_duration_ = wholenote_ / default_duration_;  // we will need to check if we are a dotted note after
+    this->note_duration_ =
+        this->wholenote_ / this->default_duration_;  // we will need to check if we are a dotted note after
   }
 
   uint8_t note;
 
-  switch (rtttl_[position_]) {
+  switch (this->rtttl_[this->position_]) {
     case 'c':
       note = 1;
       break;
@@ -138,51 +220,81 @@ void Rtttl::loop() {
     default:
       note = 0;
   }
-  position_++;
+  this->position_++;
 
   // now, get optional '#' sharp
-  if (rtttl_[position_] == '#') {
+  if (this->rtttl_[this->position_] == '#') {
     note++;
-    position_++;
+    this->position_++;
   }
 
   // now, get optional '.' dotted note
-  if (rtttl_[position_] == '.') {
-    note_duration_ += note_duration_ / 2;
-    position_++;
+  if (this->rtttl_[this->position_] == '.') {
+    this->note_duration_ += this->note_duration_ / 2;
+    this->position_++;
   }
 
   // now, get scale
   uint8_t scale = get_integer_();
   if (scale == 0)
-    scale = default_octave_;
+    scale = this->default_octave_;
+  bool need_note_gap = false;
 
   // Now play the note
   if (note) {
     auto note_index = (scale - 4) * 12 + note;
     if (note_index < 0 || note_index >= (int) sizeof(NOTES)) {
       ESP_LOGE(TAG, "Note out of valid range");
+      this->note_duration_ = 0;
       return;
     }
     auto freq = NOTES[note_index];
+    need_note_gap = freq == this->output_freq_;
 
-    if (freq == output_freq_) {
-      // Add small silence gap between same note
-      output_->set_level(0.0);
-      delay(DOUBLE_NOTE_GAP_MS);
-      note_duration_ -= DOUBLE_NOTE_GAP_MS;
-    }
-    output_freq_ = freq;
+    // Add small silence gap between same note
+    this->output_freq_ = freq;
 
-    ESP_LOGVV(TAG, "playing note: %d for %dms", note, note_duration_);
-    output_->update_frequency(freq);
-    output_->set_level(0.5);
+    ESP_LOGVV(TAG, "playing note: %d for %dms", note, this->note_duration_);
   } else {
-    ESP_LOGVV(TAG, "waiting: %dms", note_duration_);
-    output_->set_level(0.0);
+    ESP_LOGVV(TAG, "waiting: %dms", this->note_duration_);
+    this->output_freq_ = 0;
   }
 
-  last_note_ = millis();
+#ifdef USE_OUTPUT
+  if (this->output_ != nullptr) {
+    if (need_note_gap) {
+      this->output_->set_level(0.0);
+      delay(DOUBLE_NOTE_GAP_MS);
+      this->note_duration_ -= DOUBLE_NOTE_GAP_MS;
+    }
+    if (this->output_freq_ != 0) {
+      this->output_->update_frequency(this->output_freq_);
+      this->output_->set_level(0.5);
+    } else {
+      this->output_->set_level(0.0);
+    }
+  }
+#endif
+#ifdef USE_SPEAKER
+  if (this->speaker_ != nullptr) {
+    this->samples_sent_ = 0;
+    this->samples_count_ = (this->sample_rate_ * this->note_duration_) / I2S_SPEED;
+    // Convert from frequency in Hz to high and low samples in fixed point
+    if (this->output_freq_ != 0) {
+      this->samples_per_wave_ = (this->sample_rate_ << 10) / this->output_freq_;
+    } else {
+      this->samples_per_wave_ = 0;
+    }
+    if (need_note_gap) {
+      this->samples_gap_ = (this->sample_rate_ * DOUBLE_NOTE_GAP_MS) / I2S_SPEED;
+    } else {
+      this->samples_gap_ = 0;
+    }
+  }
+#endif
+
+  this->last_note_ = millis();
 }
+
 }  // namespace rtttl
 }  // namespace esphome
diff --git a/esphome/components/rtttl/rtttl.h b/esphome/components/rtttl/rtttl.h
index ec6fe7f98f..e09b0265be 100644
--- a/esphome/components/rtttl/rtttl.h
+++ b/esphome/components/rtttl/rtttl.h
@@ -1,23 +1,41 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include "esphome/core/automation.h"
+#include "esphome/core/component.h"
+
+#ifdef USE_OUTPUT
 #include "esphome/components/output/float_output.h"
+#endif
+
+#ifdef USE_SPEAKER
+#include "esphome/components/speaker/speaker.h"
+#endif
 
 namespace esphome {
 namespace rtttl {
 
+#ifdef USE_SPEAKER
+static const size_t SAMPLE_BUFFER_SIZE = 256;
+
+struct SpeakerSample {
+  int16_t left{0};
+  int16_t right{0};
+};
+#endif
+
 class Rtttl : public Component {
  public:
-  void set_output(output::FloatOutput *output) { output_ = output; }
+#ifdef USE_OUTPUT
+  void set_output(output::FloatOutput *output) { this->output_ = output; }
+#endif
+#ifdef USE_SPEAKER
+  void set_speaker(speaker::Speaker *speaker) { this->speaker_ = speaker; }
+#endif
   void play(std::string rtttl);
-  void stop() {
-    note_duration_ = 0;
-    output_->set_level(0.0);
-  }
+  void stop();
   void dump_config() override;
 
-  bool is_playing() { return note_duration_ != 0; }
+  bool is_playing() { return this->note_duration_ != 0; }
   void loop() override;
 
   void add_on_finished_playback_callback(std::function<void()> callback) {
@@ -27,14 +45,14 @@ class Rtttl : public Component {
  protected:
   inline uint8_t get_integer_() {
     uint8_t ret = 0;
-    while (isdigit(rtttl_[position_])) {
-      ret = (ret * 10) + (rtttl_[position_++] - '0');
+    while (isdigit(this->rtttl_[this->position_])) {
+      ret = (ret * 10) + (this->rtttl_[this->position_++] - '0');
     }
     return ret;
   }
 
-  std::string rtttl_;
-  size_t position_;
+  std::string rtttl_{""};
+  size_t position_{0};
   uint16_t wholenote_;
   uint16_t default_duration_;
   uint16_t default_octave_;
@@ -42,7 +60,22 @@ class Rtttl : public Component {
   uint16_t note_duration_;
 
   uint32_t output_freq_;
+
+#ifdef USE_OUTPUT
   output::FloatOutput *output_;
+#endif
+
+  void play_output_();
+
+#ifdef USE_SPEAKER
+  speaker::Speaker *speaker_;
+  void play_speaker_();
+  int sample_rate_{16000};
+  int samples_per_wave_{0};
+  int samples_sent_{0};
+  int samples_count_{0};
+  int samples_gap_{0};
+#endif
 
   CallbackManager<void()> on_finished_playback_callback_;
 };

From 77b530cf9e0cd8bc79a76f249aa180b6e7b96ba2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:14:39 +1300
Subject: [PATCH 100/131] Bump flake8 version in pre-commit to match
 requirements file (#5658)

---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e76f8b0df2..212c4a3ebf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
           - --quiet
         files: ^((esphome|script|tests)/.+)?[^/]+\.py$
   - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
         additional_dependencies:

From 4837e114e47981cda61a06c5bc90c73e1af9c72b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:15:05 +1300
Subject: [PATCH 101/131] Bump pytest from 7.4.2 to 7.4.3 (#5599)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements_test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements_test.txt b/requirements_test.txt
index f8c66b5ea4..3cedb2ad2f 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -5,7 +5,7 @@ pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 
 # Unit tests
-pytest==7.4.2
+pytest==7.4.3
 pytest-cov==4.1.0
 pytest-mock==3.12.0
 pytest-asyncio==0.21.1

From d5f010ee52990a97d31b444073bc3635fb0aca21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:15:20 +1300
Subject: [PATCH 102/131] Bump tzlocal from 5.1 to 5.2 (#5594)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 08e278fe53..b9b6708ff2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ PyYAML==6.0.1
 paho-mqtt==1.6.1
 colorama==0.4.6
 tornado==6.3.3
-tzlocal==5.1    # from time
+tzlocal==5.2    # from time
 tzdata>=2021.1  # from time
 pyserial==3.5
 platformio==6.1.11  # When updating platformio, also update Dockerfile

From 6ca14331e56e0cdc8418c2bdf178af37d9ddbf49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:15:28 +1300
Subject: [PATCH 103/131] Bump black from 23.10.0 to 23.10.1 (#5593)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 requirements_test.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 212c4a3ebf..ad8562640c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.10.0
+    rev: 23.10.1
     hooks:
       - id: black
         args:
diff --git a/requirements_test.txt b/requirements_test.txt
index 3cedb2ad2f..fade3cda3e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -1,6 +1,6 @@
 pylint==2.17.6
 flake8==6.1.0  # also change in .pre-commit-config.yaml when updating
-black==23.10.0  # also change in .pre-commit-config.yaml when updating
+black==23.10.1  # also change in .pre-commit-config.yaml when updating
 pyupgrade==3.15.0  # also change in .pre-commit-config.yaml when updating
 pre-commit
 

From d809c802867db5abd2e8b9684df6365ed8d94c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jc=20Mi=C3=B1arro?= <josecarlos.minarro@gmail.com>
Date: Thu, 2 Nov 2023 19:19:43 +0100
Subject: [PATCH 104/131] Add Healthcheck to Dockerfile (#5651)

---
 docker/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 61774f0a63..72aa9d9a9c 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -101,6 +101,10 @@ ENV USERNAME="" PASSWORD=""
 # Expose the dashboard to Docker
 EXPOSE 6052
 
+# Run healthcheck (heartbeat)
+HEALTHCHECK --interval=30s --timeout=30s \
+  CMD curl --fail http://localhost:6052/version -A "HealthCheck" || exit 1
+
 COPY docker/docker_entrypoint.sh /entrypoint.sh
 
 # The directory the user should mount their configuration files to

From d74a8abf9a9c156db37a0fa9a148689bae73da88 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Fri, 3 Nov 2023 08:09:17 +1300
Subject: [PATCH 105/131] Revert "Ensure that all uses of strncpy in wifi
 component are safe." (#5662)

---
 esphome/components/wifi/wifi_component.cpp               | 4 ++--
 esphome/components/wifi/wifi_component_esp32_arduino.cpp | 8 ++++----
 esphome/components/wifi/wifi_component_esp8266.cpp       | 8 ++++----
 esphome/components/wifi/wifi_component_esp_idf.cpp       | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index bd267fb0fd..b08f20de21 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -261,8 +261,8 @@ void WiFiComponent::set_sta(const WiFiAP &ap) {
 void WiFiComponent::clear_sta() { this->sta_.clear(); }
 void WiFiComponent::save_wifi_sta(const std::string &ssid, const std::string &password) {
   SavedWifiSettings save{};
-  strncpy(save.ssid, ssid.c_str(), sizeof(save.ssid) - 1);
-  strncpy(save.password, password.c_str(), sizeof(save.password) - 1);
+  strncpy(save.ssid, ssid.c_str(), sizeof(save.ssid));
+  strncpy(save.password, password.c_str(), sizeof(save.password));
   this->pref_.save(&save);
   // ensure it's written immediately
   global_preferences->sync();
diff --git a/esphome/components/wifi/wifi_component_esp32_arduino.cpp b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
index c68c1b950c..17b15757ef 100644
--- a/esphome/components/wifi/wifi_component_esp32_arduino.cpp
+++ b/esphome/components/wifi/wifi_component_esp32_arduino.cpp
@@ -164,8 +164,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
   // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_wifi.html#_CPPv417wifi_sta_config_t
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid) - 1);
-  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password) - 1);
+  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid));
+  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password));
 
   // The weakest authmode to accept in the fast scan mode
   if (ap.get_password().empty()) {
@@ -661,7 +661,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
 
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid));
   conf.ap.channel = ap.get_channel().value_or(1);
   conf.ap.ssid_hidden = ap.get_ssid().size();
   conf.ap.max_connection = 5;
@@ -672,7 +672,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.ap.password = 0;
   } else {
     conf.ap.authmode = WIFI_AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.ssid) - 1);
+    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.ssid));
   }
 
   conf.ap.pairwise_cipher = WIFI_CIPHER_TYPE_CCMP;
diff --git a/esphome/components/wifi/wifi_component_esp8266.cpp b/esphome/components/wifi/wifi_component_esp8266.cpp
index b289157bee..a48c6c711d 100644
--- a/esphome/components/wifi/wifi_component_esp8266.cpp
+++ b/esphome/components/wifi/wifi_component_esp8266.cpp
@@ -230,8 +230,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
 
   struct station_config conf {};
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid) - 1);
-  strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password) - 1);
+  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid));
+  strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password));
 
   if (ap.get_bssid().has_value()) {
     conf.bssid_set = 1;
@@ -759,7 +759,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     return false;
 
   struct softap_config conf {};
-  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.ssid), ap.get_ssid().c_str(), sizeof(conf.ssid));
   conf.ssid_len = static_cast<uint8>(ap.get_ssid().size());
   conf.channel = ap.get_channel().value_or(1);
   conf.ssid_hidden = ap.get_hidden();
@@ -771,7 +771,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.password = 0;
   } else {
     conf.authmode = AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password) - 1);
+    strncpy(reinterpret_cast<char *>(conf.password), ap.get_password().c_str(), sizeof(conf.password));
   }
 
   ETS_UART_INTR_DISABLE();
diff --git a/esphome/components/wifi/wifi_component_esp_idf.cpp b/esphome/components/wifi/wifi_component_esp_idf.cpp
index 9d88848567..34ecaf887d 100644
--- a/esphome/components/wifi/wifi_component_esp_idf.cpp
+++ b/esphome/components/wifi/wifi_component_esp_idf.cpp
@@ -275,8 +275,8 @@ bool WiFiComponent::wifi_sta_connect_(const WiFiAP &ap) {
   // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_wifi.html#_CPPv417wifi_sta_config_t
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid) - 1);
-  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password) - 1);
+  strncpy(reinterpret_cast<char *>(conf.sta.ssid), ap.get_ssid().c_str(), sizeof(conf.sta.ssid));
+  strncpy(reinterpret_cast<char *>(conf.sta.password), ap.get_password().c_str(), sizeof(conf.sta.password));
 
   // The weakest authmode to accept in the fast scan mode
   if (ap.get_password().empty()) {
@@ -823,7 +823,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
 
   wifi_config_t conf;
   memset(&conf, 0, sizeof(conf));
-  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid) - 1);
+  strncpy(reinterpret_cast<char *>(conf.ap.ssid), ap.get_ssid().c_str(), sizeof(conf.ap.ssid));
   conf.ap.channel = ap.get_channel().value_or(1);
   conf.ap.ssid_hidden = ap.get_ssid().size();
   conf.ap.max_connection = 5;
@@ -834,7 +834,7 @@ bool WiFiComponent::wifi_start_ap_(const WiFiAP &ap) {
     *conf.ap.password = 0;
   } else {
     conf.ap.authmode = WIFI_AUTH_WPA2_PSK;
-    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.password) - 1);
+    strncpy(reinterpret_cast<char *>(conf.ap.password), ap.get_password().c_str(), sizeof(conf.ap.password));
   }
 
   // pairwise cipher of SoftAP, group cipher will be derived using this.

From 22cdb8dfc3f30902a0e9bff2bbb846c6d59d9332 Mon Sep 17 00:00:00 2001
From: Mike La Spina <mike.laspina@shaw.ca>
Date: Thu, 2 Nov 2023 18:02:23 -0500
Subject: [PATCH 106/131] Add HLK-LD2420 mmWave Radar module component (#4847)

Co-authored-by: descipher <120155735+GelidusResearch@users.noreply.github.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/ld2420/__init__.py         |  39 +
 .../ld2420/binary_sensor/__init__.py          |  33 +
 .../binary_sensor/ld2420_binary_sensor.cpp    |  16 +
 .../binary_sensor/ld2420_binary_sensor.h      |  25 +
 esphome/components/ld2420/button/__init__.py  |  69 ++
 .../ld2420/button/reconfig_buttons.cpp        |  16 +
 .../ld2420/button/reconfig_buttons.h          |  42 +
 esphome/components/ld2420/ld2420.cpp          | 775 ++++++++++++++++++
 esphome/components/ld2420/ld2420.h            | 272 ++++++
 esphome/components/ld2420/number/__init__.py  | 183 +++++
 .../ld2420/number/gate_config_number.cpp      |  73 ++
 .../ld2420/number/gate_config_number.h        |  78 ++
 esphome/components/ld2420/select/__init__.py  |  33 +
 .../ld2420/select/operating_mode_select.cpp   |  16 +
 .../ld2420/select/operating_mode_select.h     |  18 +
 esphome/components/ld2420/sensor/__init__.py  |  35 +
 .../ld2420/sensor/ld2420_sensor.cpp           |  16 +
 .../components/ld2420/sensor/ld2420_sensor.h  |  34 +
 .../components/ld2420/text_sensor/__init__.py |  38 +
 .../ld2420/text_sensor/text_sensor.cpp        |  16 +
 .../ld2420/text_sensor/text_sensor.h          |  24 +
 tests/test1.yaml                              |  13 +
 23 files changed, 1865 insertions(+)
 create mode 100644 esphome/components/ld2420/__init__.py
 create mode 100644 esphome/components/ld2420/binary_sensor/__init__.py
 create mode 100644 esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
 create mode 100644 esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
 create mode 100644 esphome/components/ld2420/button/__init__.py
 create mode 100644 esphome/components/ld2420/button/reconfig_buttons.cpp
 create mode 100644 esphome/components/ld2420/button/reconfig_buttons.h
 create mode 100644 esphome/components/ld2420/ld2420.cpp
 create mode 100644 esphome/components/ld2420/ld2420.h
 create mode 100644 esphome/components/ld2420/number/__init__.py
 create mode 100644 esphome/components/ld2420/number/gate_config_number.cpp
 create mode 100644 esphome/components/ld2420/number/gate_config_number.h
 create mode 100644 esphome/components/ld2420/select/__init__.py
 create mode 100644 esphome/components/ld2420/select/operating_mode_select.cpp
 create mode 100644 esphome/components/ld2420/select/operating_mode_select.h
 create mode 100644 esphome/components/ld2420/sensor/__init__.py
 create mode 100644 esphome/components/ld2420/sensor/ld2420_sensor.cpp
 create mode 100644 esphome/components/ld2420/sensor/ld2420_sensor.h
 create mode 100644 esphome/components/ld2420/text_sensor/__init__.py
 create mode 100644 esphome/components/ld2420/text_sensor/text_sensor.cpp
 create mode 100644 esphome/components/ld2420/text_sensor/text_sensor.h

diff --git a/CODEOWNERS b/CODEOWNERS
index 38bb21e0ac..bf5f6a233e 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -152,6 +152,7 @@ esphome/components/key_provider/* @ssieb
 esphome/components/kuntze/* @ssieb
 esphome/components/lcd_menu/* @numo68
 esphome/components/ld2410/* @regevbr @sebcaps
+esphome/components/ld2420/* @descipher
 esphome/components/ledc/* @OttoWinter
 esphome/components/libretiny/* @kuba2k2
 esphome/components/libretiny_pwm/* @kuba2k2
diff --git a/esphome/components/ld2420/__init__.py b/esphome/components/ld2420/__init__.py
new file mode 100644
index 0000000000..c701423081
--- /dev/null
+++ b/esphome/components/ld2420/__init__.py
@@ -0,0 +1,39 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import uart
+from esphome.const import CONF_ID
+
+CODEOWNERS = ["@descipher"]
+
+DEPENDENCIES = ["uart"]
+
+MULTI_CONF = True
+
+ld2420_ns = cg.esphome_ns.namespace("ld2420")
+LD2420Component = ld2420_ns.class_("LD2420Component", cg.Component, uart.UARTDevice)
+
+CONF_LD2420_ID = "ld2420_id"
+
+CONFIG_SCHEMA = cv.All(
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(LD2420Component),
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.COMPONENT_SCHEMA)
+)
+
+FINAL_VALIDATE_SCHEMA = uart.final_validate_device_schema(
+    "ld2420_uart",
+    require_tx=True,
+    require_rx=True,
+    parity="NONE",
+    stop_bits=1,
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
diff --git a/esphome/components/ld2420/binary_sensor/__init__.py b/esphome/components/ld2420/binary_sensor/__init__.py
new file mode 100644
index 0000000000..f94e4d969f
--- /dev/null
+++ b/esphome/components/ld2420/binary_sensor/__init__.py
@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import binary_sensor
+from esphome.const import CONF_ID, DEVICE_CLASS_OCCUPANCY
+from .. import ld2420_ns, LD2420Component, CONF_LD2420_ID
+
+LD2420BinarySensor = ld2420_ns.class_(
+    "LD2420BinarySensor", binary_sensor.BinarySensor, cg.Component
+)
+
+CONF_HAS_TARGET = "has_target"
+
+CONFIG_SCHEMA = cv.All(
+    cv.COMPONENT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(LD2420BinarySensor),
+            cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+            cv.Optional(CONF_HAS_TARGET): binary_sensor.binary_sensor_schema(
+                device_class=DEVICE_CLASS_OCCUPANCY
+            ),
+        }
+    ),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    if CONF_HAS_TARGET in config:
+        sens = await binary_sensor.new_binary_sensor(config[CONF_HAS_TARGET])
+        cg.add(var.set_presence_sensor(sens))
+    ld2420 = await cg.get_variable(config[CONF_LD2420_ID])
+    cg.add(ld2420.register_listener(var))
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
new file mode 100644
index 0000000000..c6ea0a348b
--- /dev/null
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.cpp
@@ -0,0 +1,16 @@
+#include "ld2420_binary_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ld2420 {
+
+static const char *const TAG = "LD2420.binary_sensor";
+
+void LD2420BinarySensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "LD2420 BinarySensor:");
+  LOG_BINARY_SENSOR("  ", "Presence", this->presence_bsensor_);
+}
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
new file mode 100644
index 0000000000..ee06439090
--- /dev/null
+++ b/esphome/components/ld2420/binary_sensor/ld2420_binary_sensor.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "../ld2420.h"
+#include "esphome/components/binary_sensor/binary_sensor.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420BinarySensor : public LD2420Listener, public Component, binary_sensor::BinarySensor {
+ public:
+  void dump_config() override;
+  void set_presence_sensor(binary_sensor::BinarySensor *bsensor) { this->presence_bsensor_ = bsensor; };
+  void on_presence(bool presence) override {
+    if (this->presence_bsensor_ != nullptr) {
+      if (this->presence_bsensor_->state != presence)
+        this->presence_bsensor_->publish_state(presence);
+    }
+  }
+
+ protected:
+  binary_sensor::BinarySensor *presence_bsensor_{nullptr};
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/button/__init__.py b/esphome/components/ld2420/button/__init__.py
new file mode 100644
index 0000000000..675e041dd4
--- /dev/null
+++ b/esphome/components/ld2420/button/__init__.py
@@ -0,0 +1,69 @@
+import esphome.codegen as cg
+from esphome.components import button
+import esphome.config_validation as cv
+from esphome.const import (
+    DEVICE_CLASS_RESTART,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ENTITY_CATEGORY_CONFIG,
+    ICON_RESTART,
+    ICON_RESTART_ALERT,
+    ICON_DATABASE,
+)
+from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
+
+LD2420ApplyConfigButton = ld2420_ns.class_("LD2420ApplyConfigButton", button.Button)
+LD2420RevertConfigButton = ld2420_ns.class_("LD2420RevertConfigButton", button.Button)
+LD2420RestartModuleButton = ld2420_ns.class_("LD2420RestartModuleButton", button.Button)
+LD2420FactoryResetButton = ld2420_ns.class_("LD2420FactoryResetButton", button.Button)
+
+CONF_APPLY_CONFIG = "apply_config"
+CONF_REVERT_CONFIG = "revert_config"
+CONF_RESTART_MODULE = "restart_module"
+CONF_FACTORY_RESET = "factory_reset"
+
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+    cv.Required(CONF_APPLY_CONFIG): button.button_schema(
+        LD2420ApplyConfigButton,
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_RESTART_ALERT,
+    ),
+    cv.Optional(CONF_REVERT_CONFIG): button.button_schema(
+        LD2420RevertConfigButton,
+        device_class=DEVICE_CLASS_RESTART,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_RESTART,
+    ),
+    cv.Optional(CONF_RESTART_MODULE): button.button_schema(
+        LD2420RestartModuleButton,
+        entity_category=ENTITY_CATEGORY_DIAGNOSTIC,
+        icon=ICON_DATABASE,
+    ),
+    cv.Optional(CONF_FACTORY_RESET): button.button_schema(
+        LD2420FactoryResetButton,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+        icon=ICON_DATABASE,
+    ),
+}
+
+
+async def to_code(config):
+    ld2420_component = await cg.get_variable(config[CONF_LD2420_ID])
+    if apply_config := config.get(CONF_APPLY_CONFIG):
+        b = await button.new_button(apply_config)
+        await cg.register_parented(b, config[CONF_LD2420_ID])
+        cg.add(ld2420_component.set_apply_config_button(b))
+    if revert_config := config.get(CONF_REVERT_CONFIG):
+        b = await button.new_button(revert_config)
+        await cg.register_parented(b, config[CONF_LD2420_ID])
+        cg.add(ld2420_component.set_revert_config_button(b))
+    if restart_config := config.get(CONF_RESTART_MODULE):
+        b = await button.new_button(restart_config)
+        await cg.register_parented(b, config[CONF_LD2420_ID])
+        cg.add(ld2420_component.set_restart_module_button(b))
+    if factory_reset := config.get(CONF_FACTORY_RESET):
+        b = await button.new_button(factory_reset)
+        await cg.register_parented(b, config[CONF_LD2420_ID])
+        cg.add(ld2420_component.set_factory_reset_button(b))
diff --git a/esphome/components/ld2420/button/reconfig_buttons.cpp b/esphome/components/ld2420/button/reconfig_buttons.cpp
new file mode 100644
index 0000000000..3537c1d64a
--- /dev/null
+++ b/esphome/components/ld2420/button/reconfig_buttons.cpp
@@ -0,0 +1,16 @@
+#include "reconfig_buttons.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+static const char *const TAG = "LD2420.button";
+
+namespace esphome {
+namespace ld2420 {
+
+void LD2420ApplyConfigButton::press_action() { this->parent_->apply_config_action(); }
+void LD2420RevertConfigButton::press_action() { this->parent_->revert_config_action(); }
+void LD2420RestartModuleButton::press_action() { this->parent_->restart_module_action(); }
+void LD2420FactoryResetButton::press_action() { this->parent_->factory_reset_action(); }
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/button/reconfig_buttons.h b/esphome/components/ld2420/button/reconfig_buttons.h
new file mode 100644
index 0000000000..4e9e7a3692
--- /dev/null
+++ b/esphome/components/ld2420/button/reconfig_buttons.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "esphome/components/button/button.h"
+#include "../ld2420.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420ApplyConfigButton : public button::Button, public Parented<LD2420Component> {
+ public:
+  LD2420ApplyConfigButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+class LD2420RevertConfigButton : public button::Button, public Parented<LD2420Component> {
+ public:
+  LD2420RevertConfigButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+class LD2420RestartModuleButton : public button::Button, public Parented<LD2420Component> {
+ public:
+  LD2420RestartModuleButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+class LD2420FactoryResetButton : public button::Button, public Parented<LD2420Component> {
+ public:
+  LD2420FactoryResetButton() = default;
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/ld2420.cpp b/esphome/components/ld2420/ld2420.cpp
new file mode 100644
index 0000000000..6130617457
--- /dev/null
+++ b/esphome/components/ld2420/ld2420.cpp
@@ -0,0 +1,775 @@
+#include "ld2420.h"
+#include "esphome/core/helpers.h"
+
+/*
+Configure commands - little endian
+
+No command can exceed 64 bytes, otherwise they would need be to be split up into multiple sends.
+
+All send command frames will have:
+  Header = FD FC FB FA, Bytes 0 - 3, uint32_t 0xFAFBFCFD
+  Length, bytes 4 - 5, uint16_t 0x0002, must be at least 2 for the command byte if no addon data.
+  Command bytes 6 - 7, uint16_t
+  Footer = 04 03 02 01 - uint32_t 0x01020304, Always last 4 Bytes.
+Receive
+  Error bytes 8-9 uint16_t, 0 = success, all other positive values = error
+
+Enable config mode:
+Send:
+  UART Tx: FD FC FB FA 04 00 FF 00 02 00 04 03 02 01
+  Command = FF 00 - uint16_t 0x00FF
+  Protocol version = 02 00, can be 1 or 2 - uint16_t 0x0002
+Reply:
+  UART Rx: FD FC FB FA 06 00 FF 01 00 00 02 00 04 03 02 01
+
+Disable config mode:
+Send:
+  UART Tx: FD FC FB FA 02 00 FE 00 04 03 02 01
+  Command = FE 00 - uint16_t 0x00FE
+Receive:
+  UART Rx: FD FC FB FA 04 00 FE 01 00 00 04 03 02 01
+
+Configure system parameters:
+
+UART Tx: FD FC FB FA 08 00 12 00 00 00 64 00 00 00 04 03 02 01  Set system parms
+Command = 12 00 - uint16_t 0x0012, Param
+There are three documented parameters for modes:
+  00 64 = Basic status mode
+    This mode outputs text as presence "ON" or  "OFF" and "Range XXXX"
+    where XXXX is a decimal value for distance in cm
+  00 04 = Energy output mode
+    This mode outputs detailed signal energy values for each gate and the target distance.
+    The data format consist of the following.
+    Header HH, Length LL, Persence PP, Distance DD, Range Gate GG, 16 Gate Energies EE, Footer FF
+    HH HH HH HH LL LL PP DD DD GG GG EE EE .. 16x   .. FF FF FF FF
+    F4 F3 F2 F1 00 23 00 00 00 00 01 00 00 .. .. .. .. F8 F7 F6 F5
+  00 00 = debug output mode
+    This mode outputs detailed values consisting of 20 Dopplers, 16 Ranges for a total 20 * 16 * 4 bytes
+    The data format consist of the following.
+    Header HH, Doppler DD, Range RR, Footer FF
+    HH HH HH HH DD DD DD DD .. 20x   .. RR RR RR RR .. 16x   .. FF FF FF FF
+    AA BF 10 14 00 00 00 00 .. .. .. .. 00 00 00 00 .. .. .. .. FD FC FB FA
+
+Configure gate sensitivity parameters:
+UART Tx: FD FC FB FA 0E 00 07 00 10 00 60 EA 00 00 20 00 60 EA 00 00 04 03 02 01
+Command = 12 00 - uint16_t 0x0007
+Gate 0 high thresh = 10 00 uint16_t 0x0010, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
+Gate 0 low thresh = 20 00 uint16_t 0x0020, Threshold value = 60 EA 00 00 uint32_t 0x0000EA60
+*/
+
+namespace esphome {
+namespace ld2420 {
+
+static const char *const TAG = "ld2420";
+
+float LD2420Component::get_setup_priority() const { return setup_priority::BUS; }
+
+void LD2420Component::dump_config() {
+  ESP_LOGCONFIG(TAG, "LD2420:");
+  ESP_LOGCONFIG(TAG, "  Firmware Version : %7s", this->ld2420_firmware_ver_);
+  ESP_LOGCONFIG(TAG, "LD2420 Number:");
+  LOG_NUMBER(TAG, "  Gate Timeout:", this->gate_timeout_number_);
+  LOG_NUMBER(TAG, "  Gate Max Distance:", this->max_gate_distance_number_);
+  LOG_NUMBER(TAG, "  Gate Min Distance:", this->min_gate_distance_number_);
+  LOG_NUMBER(TAG, "  Gate Select:", this->gate_select_number_);
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+    LOG_NUMBER(TAG, "  Gate Move Threshold:", this->gate_move_threshold_numbers_[gate]);
+    LOG_NUMBER(TAG, "  Gate Still Threshold::", this->gate_still_threshold_numbers_[gate]);
+  }
+  LOG_BUTTON(TAG, "  Apply Config:", this->apply_config_button_);
+  LOG_BUTTON(TAG, "  Revert Edits:", this->revert_config_button_);
+  LOG_BUTTON(TAG, "  Factory Reset:", this->factory_reset_button_);
+  LOG_BUTTON(TAG, "  Restart Module:", this->restart_module_button_);
+  ESP_LOGCONFIG(TAG, "LD2420 Select:");
+  LOG_SELECT(TAG, "  Operating Mode", this->operating_selector_);
+  if (this->get_firmware_int_(ld2420_firmware_ver_) < CALIBRATE_VERSION_MIN) {
+    ESP_LOGW(TAG, "LD2420 Firmware Version %s and older are only supported in Simple Mode", ld2420_firmware_ver_);
+  }
+}
+
+uint8_t LD2420Component::calc_checksum(void *data, size_t size) {
+  uint8_t checksum = 0;
+  uint8_t *data_bytes = (uint8_t *) data;
+  for (size_t i = 0; i < size; i++) {
+    checksum ^= data_bytes[i];  // XOR operation
+  }
+  return checksum;
+}
+
+int LD2420Component::get_firmware_int_(const char *version_string) {
+  std::string version_str = version_string;
+  if (version_str[0] == 'v') {
+    version_str = version_str.substr(1);
+  }
+  version_str.erase(remove(version_str.begin(), version_str.end(), '.'), version_str.end());
+  int version_integer = stoi(version_str);
+  return version_integer;
+}
+
+void LD2420Component::setup() {
+  ESP_LOGCONFIG(TAG, "Setting up LD2420...");
+  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();
+    return;
+  }
+  this->get_min_max_distances_timeout_();
+#ifdef USE_NUMBER
+  this->init_gate_config_numbers();
+#endif
+  this->get_firmware_version_();
+  const char *pfw = this->ld2420_firmware_ver_;
+  std::string fw_str(pfw);
+
+  for (auto &listener : listeners_) {
+    listener->on_fw_version(fw_str);
+  }
+
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+    delay_microseconds_safe(125);
+    this->get_gate_threshold_(gate);
+  }
+
+  memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
+  if (get_firmware_int_(ld2420_firmware_ver_) < CALIBRATE_VERSION_MIN) {
+    this->set_operating_mode(OP_SIMPLE_MODE_STRING);
+    this->operating_selector_->publish_state(OP_SIMPLE_MODE_STRING);
+    this->set_mode_(CMD_SYSTEM_MODE_SIMPLE);
+    ESP_LOGW(TAG, "LD2420 Frimware Version %s and older are only supported in Simple Mode", ld2420_firmware_ver_);
+  } else {
+    this->set_mode_(CMD_SYSTEM_MODE_ENERGY);
+    this->operating_selector_->publish_state(OP_NORMAL_MODE_STRING);
+  }
+#ifdef USE_NUMBER
+  this->init_gate_config_numbers();
+#endif
+  this->set_system_mode(this->system_mode_);
+  this->set_config_mode(false);
+  ESP_LOGCONFIG(TAG, "LD2420 setup complete.");
+}
+
+void LD2420Component::apply_config_action() {
+  const uint8_t checksum = calc_checksum(&this->new_config, sizeof(this->new_config));
+  if (checksum == calc_checksum(&this->current_config, sizeof(this->current_config))) {
+    ESP_LOGCONFIG(TAG, "No configuration change detected");
+    return;
+  }
+  ESP_LOGCONFIG(TAG, "Reconfiguring LD2420...");
+  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();
+    return;
+  }
+  this->set_min_max_distances_timeout(this->new_config.max_gate, this->new_config.min_gate, this->new_config.timeout);
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+    delay_microseconds_safe(125);
+    this->set_gate_threshold(gate);
+  }
+  memcpy(&current_config, &new_config, sizeof(new_config));
+#ifdef USE_NUMBER
+  this->init_gate_config_numbers();
+#endif
+  this->set_system_mode(this->system_mode_);
+  this->set_config_mode(false);  // Disable config mode to save new values in LD2420 nvm
+  this->set_operating_mode(OP_NORMAL_MODE_STRING);
+  ESP_LOGCONFIG(TAG, "LD2420 reconfig complete.");
+}
+
+void LD2420Component::factory_reset_action() {
+  ESP_LOGCONFIG(TAG, "Setiing 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();
+    return;
+  }
+  this->set_min_max_distances_timeout(FACTORY_MAX_GATE, FACTORY_MIN_GATE, FACTORY_TIMEOUT);
+  this->gate_timeout_number_->state = FACTORY_TIMEOUT;
+  this->min_gate_distance_number_->state = FACTORY_MIN_GATE;
+  this->max_gate_distance_number_->state = FACTORY_MAX_GATE;
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+    this->new_config.move_thresh[gate] = FACTORY_MOVE_THRESH[gate];
+    this->new_config.still_thresh[gate] = FACTORY_STILL_THRESH[gate];
+    delay_microseconds_safe(125);
+    this->set_gate_threshold(gate);
+  }
+  memcpy(&this->current_config, &this->new_config, sizeof(this->new_config));
+  this->set_system_mode(this->system_mode_);
+  this->set_config_mode(false);
+#ifdef USE_NUMBER
+  this->init_gate_config_numbers();
+  this->refresh_gate_config_numbers();
+#endif
+  ESP_LOGCONFIG(TAG, "LD2420 factory reset complete.");
+}
+
+void LD2420Component::restart_module_action() {
+  ESP_LOGCONFIG(TAG, "Restarting LD2420 module...");
+  this->send_module_restart();
+  delay_microseconds_safe(45000);
+  this->set_config_mode(true);
+  this->set_system_mode(system_mode_);
+  this->set_config_mode(false);
+  ESP_LOGCONFIG(TAG, "LD2420 Restarted.");
+}
+
+void LD2420Component::revert_config_action() {
+  memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
+#ifdef USE_NUMBER
+  this->init_gate_config_numbers();
+#endif
+  ESP_LOGCONFIG(TAG, "Reverted config number edits.");
+}
+
+void LD2420Component::loop() {
+  // If there is a active send command do not process it here, the send command call will handle it.
+  if (!get_cmd_active_()) {
+    if (!available())
+      return;
+    static uint8_t buffer[2048];
+    static uint8_t rx_data;
+    while (available()) {
+      rx_data = read();
+      this->readline_(rx_data, buffer, sizeof(buffer));
+    }
+  }
+}
+
+void LD2420Component::update_radar_data(uint16_t const *gate_energy, uint8_t sample_number) {
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; ++gate) {
+    this->radar_data[gate][sample_number] = gate_energy[gate];
+  }
+  this->total_sample_number_counter++;
+}
+
+void LD2420Component::auto_calibrate_sensitivity() {
+  // Calculate average and peak values for each gate
+  const float move_factor = gate_move_sensitivity_factor + 1;
+  const float still_factor = (gate_still_sensitivity_factor / 2) + 1;
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; ++gate) {
+    uint32_t sum = 0;
+    uint16_t peak = 0;
+
+    for (uint8_t sample_number = 0; sample_number < CALIBRATE_SAMPLES; ++sample_number) {
+      // Calculate average
+      sum += this->radar_data[gate][sample_number];
+
+      // Calculate max value
+      if (this->radar_data[gate][sample_number] > peak) {
+        peak = this->radar_data[gate][sample_number];
+      }
+    }
+
+    // Store average and peak values
+    this->gate_avg[gate] = sum / CALIBRATE_SAMPLES;
+    if (this->gate_peak[gate] < peak)
+      this->gate_peak[gate] = peak;
+
+    uint32_t calculated_value =
+        (static_cast<uint32_t>(this->gate_peak[gate]) + (move_factor * static_cast<uint32_t>(this->gate_peak[gate])));
+    this->new_config.move_thresh[gate] = static_cast<uint16_t>(calculated_value <= 65535 ? calculated_value : 65535);
+    calculated_value =
+        (static_cast<uint32_t>(this->gate_peak[gate]) + (still_factor * static_cast<uint32_t>(this->gate_peak[gate])));
+    this->new_config.still_thresh[gate] = static_cast<uint16_t>(calculated_value <= 65535 ? calculated_value : 65535);
+  }
+}
+
+void LD2420Component::report_gate_data() {
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; ++gate) {
+    // Output results
+    ESP_LOGI(TAG, "Gate: %2d Avg: %5d Peak: %5d", gate, this->gate_avg[gate], this->gate_peak[gate]);
+  }
+  ESP_LOGI(TAG, "Total samples: %d", this->total_sample_number_counter);
+}
+
+void LD2420Component::set_operating_mode(const std::string &state) {
+  // If unsupported firmware ignore mode select
+  if (get_firmware_int_(ld2420_firmware_ver_) >= CALIBRATE_VERSION_MIN) {
+    this->current_operating_mode = OP_MODE_TO_UINT.at(state);
+    // Entering Auto Calibrate we need to clear the privoiuos data collection
+    this->operating_selector_->publish_state(state);
+    if (current_operating_mode == OP_CALIBRATE_MODE) {
+      this->set_calibration_(true);
+      for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+        this->gate_avg[gate] = 0;
+        this->gate_peak[gate] = 0;
+        for (uint8_t i = 0; i < CALIBRATE_SAMPLES; i++) {
+          this->radar_data[gate][i] = 0;
+        }
+        this->total_sample_number_counter = 0;
+      }
+    } else {
+      // Set the current data back so we don't have new data that can be applied in error.
+      if (this->get_calibration_())
+        memcpy(&this->new_config, &this->current_config, sizeof(this->current_config));
+      this->set_calibration_(false);
+    }
+  } else {
+    this->current_operating_mode = OP_SIMPLE_MODE;
+    this->operating_selector_->publish_state(OP_SIMPLE_MODE_STRING);
+  }
+}
+
+void LD2420Component::readline_(int rx_data, uint8_t *buffer, int len) {
+  static int pos = 0;
+
+  if (rx_data >= 0) {
+    if (pos < len - 1) {
+      buffer[pos++] = rx_data;
+      buffer[pos] = 0;
+    } else {
+      pos = 0;
+    }
+    if (pos >= 4) {
+      if (memcmp(&buffer[pos - 4], &CMD_FRAME_FOOTER, sizeof(CMD_FRAME_FOOTER)) == 0) {
+        this->set_cmd_active_(false);  // Set command state to inactive after responce.
+        this->handle_ack_data_(buffer, pos);
+        pos = 0;
+      } else if ((buffer[pos - 2] == 0x0D && buffer[pos - 1] == 0x0A) && (get_mode_() == CMD_SYSTEM_MODE_SIMPLE)) {
+        this->handle_simple_mode_(buffer, pos);
+        pos = 0;
+      } else if ((memcmp(&buffer[pos - 4], &ENERGY_FRAME_FOOTER, sizeof(ENERGY_FRAME_FOOTER)) == 0) &&
+                 (get_mode_() == CMD_SYSTEM_MODE_ENERGY)) {
+        this->handle_energy_mode_(buffer, pos);
+        pos = 0;
+      }
+    }
+  }
+}
+
+void LD2420Component::handle_energy_mode_(uint8_t *buffer, int len) {
+  uint8_t index = 6;  // Start at presence byte position
+  uint16_t range;
+  const uint8_t elements = sizeof(this->gate_energy_) / sizeof(this->gate_energy_[0]);
+  this->set_presence_(buffer[index]);
+  index++;
+  memcpy(&range, &buffer[index], sizeof(range));
+  index += sizeof(range);
+  this->set_distance_(range);
+  for (uint8_t i = 0; i < elements; i++) {  // NOLINT
+    memcpy(&this->gate_energy_[i], &buffer[index], sizeof(this->gate_energy_[0]));
+    index += sizeof(this->gate_energy_[0]);
+  }
+
+  if (this->current_operating_mode == OP_CALIBRATE_MODE) {
+    this->update_radar_data(gate_energy_, sample_number_counter);
+    this->sample_number_counter > CALIBRATE_SAMPLES ? this->sample_number_counter = 0 : this->sample_number_counter++;
+  }
+
+  // Resonable refresh rate for home assistant database size health
+  const int32_t current_millis = millis();
+  if (current_millis - this->last_periodic_millis < REFRESH_RATE_MS)
+    return;
+  this->last_periodic_millis = current_millis;
+  for (auto &listener : this->listeners_) {
+    listener->on_distance(get_distance_());
+    listener->on_presence(get_presence_());
+    listener->on_energy(this->gate_energy_, sizeof(this->gate_energy_) / sizeof(this->gate_energy_[0]));
+  }
+
+  if (this->current_operating_mode == OP_CALIBRATE_MODE) {
+    this->auto_calibrate_sensitivity();
+    if (current_millis - this->report_periodic_millis > REFRESH_RATE_MS * CALIBRATE_REPORT_INTERVAL) {
+      this->report_periodic_millis = current_millis;
+      this->report_gate_data();
+    }
+  }
+}
+
+void LD2420Component::handle_simple_mode_(const uint8_t *inbuf, int len) {
+  const uint8_t bufsize = 16;
+  uint8_t index{0};
+  uint8_t pos{0};
+  char *endptr{nullptr};
+  char outbuf[bufsize]{0};
+  while (true) {
+    if (inbuf[pos - 2] == 'O' && inbuf[pos - 1] == 'F' && inbuf[pos] == 'F') {
+      set_presence_(false);
+    } else if (inbuf[pos - 1] == 'O' && inbuf[pos] == 'N') {
+      set_presence_(true);
+    }
+    if (inbuf[pos] >= '0' && inbuf[pos] <= '9') {
+      if (index < bufsize - 1) {
+        outbuf[index++] = inbuf[pos];
+        pos++;
+      }
+    } else {
+      if (pos < len - 1) {
+        pos++;
+      } else {
+        break;
+      }
+    }
+  }
+  outbuf[index] = '\0';
+  if (index > 1)
+    set_distance_(strtol(outbuf, &endptr, 10));
+
+  if (get_mode_() == CMD_SYSTEM_MODE_SIMPLE) {
+    // Resonable refresh rate for home assistant database size health
+    const int32_t current_millis = millis();
+    if (current_millis - this->last_normal_periodic_millis < REFRESH_RATE_MS)
+      return;
+    this->last_normal_periodic_millis = current_millis;
+    for (auto &listener : this->listeners_)
+      listener->on_distance(get_distance_());
+    for (auto &listener : this->listeners_)
+      listener->on_presence(get_presence_());
+  }
+}
+
+void LD2420Component::handle_ack_data_(uint8_t *buffer, int len) {
+  this->cmd_reply_.command = buffer[CMD_FRAME_COMMAND];
+  this->cmd_reply_.length = buffer[CMD_FRAME_DATA_LENGTH];
+  uint8_t reg_element = 0;
+  uint8_t data_element = 0;
+  uint16_t data_pos = 0;
+  if (this->cmd_reply_.length > CMD_MAX_BYTES) {
+    ESP_LOGW(TAG, "LD2420 reply - received command reply frame is corrupt, length exceeds %d bytes.", CMD_MAX_BYTES);
+    return;
+  } else if (this->cmd_reply_.length < 2) {
+    ESP_LOGW(TAG, "LD2420 reply - received command frame is corrupt, length is less than 2 bytes.");
+    return;
+  }
+  memcpy(&this->cmd_reply_.error, &buffer[CMD_ERROR_WORD], sizeof(this->cmd_reply_.error));
+  const char *result = this->cmd_reply_.error ? "failure" : "success";
+  if (this->cmd_reply_.error > 0) {
+    return;
+  };
+  this->cmd_reply_.ack = true;
+  switch ((uint16_t) this->cmd_reply_.command) {
+    case (CMD_ENABLE_CONF):
+      ESP_LOGD(TAG, "LD2420 reply - set config enable: CMD = %2X %s", CMD_ENABLE_CONF, result);
+      break;
+    case (CMD_DISABLE_CONF):
+      ESP_LOGD(TAG, "LD2420 reply - set config disable: CMD = %2X %s", CMD_DISABLE_CONF, result);
+      break;
+    case (CMD_READ_REGISTER):
+      ESP_LOGD(TAG, "LD2420 reply - read register: CMD = %2X %s", CMD_READ_REGISTER, result);
+      // TODO Read/Write register is not implemented yet, this will get flushed out to a proper header file
+      data_pos = 0x0A;
+      for (uint16_t index = 0; index < (CMD_REG_DATA_REPLY_SIZE *  // NOLINT
+                                        ((buffer[CMD_FRAME_DATA_LENGTH] - 4) / CMD_REG_DATA_REPLY_SIZE));
+           index += CMD_REG_DATA_REPLY_SIZE) {
+        memcpy(&this->cmd_reply_.data[reg_element], &buffer[data_pos + index], sizeof(CMD_REG_DATA_REPLY_SIZE));
+        byteswap(this->cmd_reply_.data[reg_element]);
+        reg_element++;
+      }
+      break;
+    case (CMD_WRITE_REGISTER):
+      ESP_LOGD(TAG, "LD2420 reply - write register: CMD = %2X %s", CMD_WRITE_REGISTER, result);
+      break;
+    case (CMD_WRITE_ABD_PARAM):
+      ESP_LOGD(TAG, "LD2420 reply - write gate parameter(s): %2X %s", CMD_WRITE_ABD_PARAM, result);
+      break;
+    case (CMD_READ_ABD_PARAM):
+      ESP_LOGD(TAG, "LD2420 reply - read gate parameter(s): %2X %s", CMD_READ_ABD_PARAM, result);
+      data_pos = CMD_ABD_DATA_REPLY_START;
+      for (uint16_t index = 0; index < (CMD_ABD_DATA_REPLY_SIZE *  // NOLINT
+                                        ((buffer[CMD_FRAME_DATA_LENGTH] - 4) / CMD_ABD_DATA_REPLY_SIZE));
+           index += CMD_ABD_DATA_REPLY_SIZE) {
+        memcpy(&this->cmd_reply_.data[data_element], &buffer[data_pos + index],
+               sizeof(this->cmd_reply_.data[data_element]));
+        byteswap(this->cmd_reply_.data[data_element]);
+        data_element++;
+      }
+      break;
+    case (CMD_WRITE_SYS_PARAM):
+      ESP_LOGD(TAG, "LD2420 reply - set system parameter(s): %2X %s", CMD_WRITE_SYS_PARAM, result);
+      break;
+    case (CMD_READ_VERSION):
+      memcpy(this->ld2420_firmware_ver_, &buffer[12], buffer[10]);
+      ESP_LOGD(TAG, "LD2420 reply - module firmware version: %7s %s", this->ld2420_firmware_ver_, result);
+      break;
+    default:
+      break;
+  }
+}
+
+int LD2420Component::send_cmd_from_array(CmdFrameT frame) {
+  uint8_t error = 0;
+  uint8_t ack_buffer[64];
+  uint8_t cmd_buffer[64];
+  uint16_t loop_count;
+  this->cmd_reply_.ack = false;
+  if (frame.command != CMD_RESTART)
+    this->set_cmd_active_(true);  // Restart does not reply, thus no ack state required.
+  uint8_t retry = 3;
+  while (retry) {
+    // TODO setup a dynamic method e.g. millis time count etc. to tune for non ESP32 240Mhz devices
+    // this is ok for now since the module firmware is changing like the weather atm
+    frame.length = 0;
+    loop_count = 1250;
+    uint16_t frame_data_bytes = frame.data_length + 2;  // Always add two bytes for the cmd size
+
+    memcpy(&cmd_buffer[frame.length], &frame.header, sizeof(frame.header));
+    frame.length += sizeof(frame.header);
+
+    memcpy(&cmd_buffer[frame.length], &frame_data_bytes, sizeof(frame.data_length));
+    frame.length += sizeof(frame.data_length);
+
+    memcpy(&cmd_buffer[frame.length], &frame.command, sizeof(frame.command));
+    frame.length += sizeof(frame.command);
+
+    for (uint16_t index = 0; index < frame.data_length; index++) {
+      memcpy(&cmd_buffer[frame.length], &frame.data[index], sizeof(frame.data[index]));
+      frame.length += sizeof(frame.data[index]);
+    }
+
+    memcpy(cmd_buffer + frame.length, &frame.footer, sizeof(frame.footer));
+    frame.length += sizeof(frame.footer);
+    for (uint16_t index = 0; index < frame.length; index++) {
+      this->write_byte(cmd_buffer[index]);
+    }
+
+    delay_microseconds_safe(500);  // give the module a moment to process it
+    error = 0;
+    if (frame.command == CMD_RESTART) {
+      delay_microseconds_safe(25000);  // Wait for the restart
+      return 0;                        // restart does not reply exit now
+    }
+
+    while (!this->cmd_reply_.ack) {
+      while (available()) {
+        this->readline_(read(), ack_buffer, sizeof(ack_buffer));
+      }
+      delay_microseconds_safe(250);
+      if (loop_count <= 0) {
+        error = LD2420_ERROR_TIMEOUT;
+        retry--;
+        break;
+      }
+      loop_count--;
+    }
+    if (this->cmd_reply_.ack)
+      retry = 0;
+    if (this->cmd_reply_.error > 0)
+      handle_cmd_error(error);
+  }
+  return error;
+}
+
+uint8_t LD2420Component::set_config_mode(bool enable) {
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = enable ? CMD_ENABLE_CONF : CMD_DISABLE_CONF;
+  if (enable) {
+    memcpy(&cmd_frame.data[0], &CMD_PROTOCOL_VER, sizeof(CMD_PROTOCOL_VER));
+    cmd_frame.data_length += sizeof(CMD_PROTOCOL_VER);
+  }
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending set config %s command: %2X", enable ? "enable" : "disable", cmd_frame.command);
+  return this->send_cmd_from_array(cmd_frame);
+}
+
+// Sends a restart and set system running mode to normal
+void LD2420Component::send_module_restart() { this->ld2420_restart(); }
+
+void LD2420Component::ld2420_restart() {
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_RESTART;
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending restart command: %2X", cmd_frame.command);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+void LD2420Component::get_reg_value_(uint16_t reg) {
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_READ_REGISTER;
+  cmd_frame.data[1] = reg;
+  cmd_frame.data_length += 2;
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending read register %4X command: %2X", reg, cmd_frame.command);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+void LD2420Component::set_reg_value(uint16_t reg, uint16_t value) {
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_WRITE_REGISTER;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &reg, sizeof(CMD_REG_DATA_REPLY_SIZE));
+  cmd_frame.data_length += 2;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &value, sizeof(CMD_REG_DATA_REPLY_SIZE));
+  cmd_frame.data_length += 2;
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending write register %4X command: %2X data = %4X", reg, cmd_frame.command, value);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+void LD2420Component::handle_cmd_error(uint8_t error) { ESP_LOGI(TAG, "Command failed: %s", ERR_MESSAGE[error]); }
+
+int LD2420Component::get_gate_threshold_(uint8_t gate) {
+  uint8_t error;
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_READ_ABD_PARAM;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_GATE_MOVE_THRESH[gate], sizeof(CMD_GATE_MOVE_THRESH[gate]));
+  cmd_frame.data_length += 2;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_GATE_STILL_THRESH[gate], sizeof(CMD_GATE_STILL_THRESH[gate]));
+  cmd_frame.data_length += 2;
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending read gate %d high/low theshold command: %2X", gate, cmd_frame.command);
+  error = this->send_cmd_from_array(cmd_frame);
+  if (error == 0) {
+    this->current_config.move_thresh[gate] = cmd_reply_.data[0];
+    this->current_config.still_thresh[gate] = cmd_reply_.data[1];
+  }
+  return error;
+}
+
+int LD2420Component::get_min_max_distances_timeout_() {
+  uint8_t error;
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_READ_ABD_PARAM;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_MIN_GATE_REG,
+         sizeof(CMD_MIN_GATE_REG));  // Register: global min detect gate number
+  cmd_frame.data_length += sizeof(CMD_MIN_GATE_REG);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_MAX_GATE_REG,
+         sizeof(CMD_MAX_GATE_REG));  // Register: global max detect gate number
+  cmd_frame.data_length += sizeof(CMD_MAX_GATE_REG);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_TIMEOUT_REG,
+         sizeof(CMD_TIMEOUT_REG));  // Register: global delay time
+  cmd_frame.data_length += sizeof(CMD_TIMEOUT_REG);
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending read gate min max and timeout command: %2X", cmd_frame.command);
+  error = this->send_cmd_from_array(cmd_frame);
+  if (error == 0) {
+    this->current_config.min_gate = (uint16_t) cmd_reply_.data[0];
+    this->current_config.max_gate = (uint16_t) cmd_reply_.data[1];
+    this->current_config.timeout = (uint16_t) cmd_reply_.data[2];
+  }
+  return error;
+}
+
+void LD2420Component::set_system_mode(uint16_t mode) {
+  CmdFrameT cmd_frame;
+  uint16_t unknown_parm = 0x0000;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_WRITE_SYS_PARAM;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_SYSTEM_MODE, sizeof(CMD_SYSTEM_MODE));
+  cmd_frame.data_length += sizeof(CMD_SYSTEM_MODE);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &mode, sizeof(mode));
+  cmd_frame.data_length += sizeof(mode);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &unknown_parm, sizeof(unknown_parm));
+  cmd_frame.data_length += sizeof(unknown_parm);
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending write system mode command: %2X", cmd_frame.command);
+  if (this->send_cmd_from_array(cmd_frame) == 0)
+    set_mode_(mode);
+}
+
+void LD2420Component::get_firmware_version_() {
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_READ_VERSION;
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+
+  ESP_LOGD(TAG, "Sending read firmware version command: %2X", cmd_frame.command);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+void LD2420Component::set_min_max_distances_timeout(uint32_t max_gate_distance, uint32_t min_gate_distance,  // NOLINT
+                                                    uint32_t timeout) {
+  // Header H, Length L, Register R, Value V, Footer F
+  //                        |Min Gate         |Max Gate         |Timeout          |
+  // HH HH HH HH LL LL CC CC RR RR VV VV VV VV RR RR VV VV VV VV RR RR VV VV VV VV FF FF FF FF
+  // FD FC FB FA 14 00 07 00 00 00 01 00 00 00 01 00 09 00 00 00 04 00 0A 00 00 00 04 03 02 01 e.g.
+
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_WRITE_ABD_PARAM;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_MIN_GATE_REG,
+         sizeof(CMD_MIN_GATE_REG));  // Register: global min detect gate number
+  cmd_frame.data_length += sizeof(CMD_MIN_GATE_REG);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &min_gate_distance, sizeof(min_gate_distance));
+  cmd_frame.data_length += sizeof(min_gate_distance);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_MAX_GATE_REG,
+         sizeof(CMD_MAX_GATE_REG));  // Register: global max detect gate number
+  cmd_frame.data_length += sizeof(CMD_MAX_GATE_REG);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &max_gate_distance, sizeof(max_gate_distance));
+  cmd_frame.data_length += sizeof(max_gate_distance);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &CMD_TIMEOUT_REG,
+         sizeof(CMD_TIMEOUT_REG));  // Register: global delay time
+  cmd_frame.data_length += sizeof(CMD_TIMEOUT_REG);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &timeout, sizeof(timeout));
+  ;
+  cmd_frame.data_length += sizeof(timeout);
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+
+  ESP_LOGD(TAG, "Sending write gate min max and timeout command: %2X", cmd_frame.command);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+void LD2420Component::set_gate_threshold(uint8_t gate) {
+  // Header H, Length L, Command C, Register R, Value V, Footer F
+  // HH HH HH HH LL LL CC CC RR RR VV VV VV VV RR RR VV VV VV VV FF FF FF FF
+  // FD FC FB FA 14 00 07 00 10 00 00 FF 00 00 00 01 00 0F 00 00 04 03 02 01
+
+  uint16_t move_threshold_gate = CMD_GATE_MOVE_THRESH[gate];
+  uint16_t still_threshold_gate = CMD_GATE_STILL_THRESH[gate];
+  CmdFrameT cmd_frame;
+  cmd_frame.data_length = 0;
+  cmd_frame.header = CMD_FRAME_HEADER;
+  cmd_frame.command = CMD_WRITE_ABD_PARAM;
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &move_threshold_gate, sizeof(move_threshold_gate));
+  cmd_frame.data_length += sizeof(move_threshold_gate);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &this->new_config.move_thresh[gate],
+         sizeof(this->new_config.move_thresh[gate]));
+  cmd_frame.data_length += sizeof(this->new_config.move_thresh[gate]);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &still_threshold_gate, sizeof(still_threshold_gate));
+  cmd_frame.data_length += sizeof(still_threshold_gate);
+  memcpy(&cmd_frame.data[cmd_frame.data_length], &this->new_config.still_thresh[gate],
+         sizeof(this->new_config.still_thresh[gate]));
+  cmd_frame.data_length += sizeof(this->new_config.still_thresh[gate]);
+  cmd_frame.footer = CMD_FRAME_FOOTER;
+  ESP_LOGD(TAG, "Sending set gate %4X sensitivity command: %2X", gate, cmd_frame.command);
+  this->send_cmd_from_array(cmd_frame);
+}
+
+#ifdef USE_NUMBER
+void LD2420Component::init_gate_config_numbers() {
+  if (this->gate_timeout_number_ != nullptr)
+    this->gate_timeout_number_->publish_state(static_cast<uint16_t>(this->current_config.timeout));
+  if (this->gate_select_number_ != nullptr)
+    this->gate_select_number_->publish_state(0);
+  if (this->min_gate_distance_number_ != nullptr)
+    this->min_gate_distance_number_->publish_state(static_cast<uint16_t>(this->current_config.min_gate));
+  if (this->max_gate_distance_number_ != nullptr)
+    this->max_gate_distance_number_->publish_state(static_cast<uint16_t>(this->current_config.max_gate));
+  if (this->gate_move_sensitivity_factor_number_ != nullptr)
+    this->gate_move_sensitivity_factor_number_->publish_state(this->gate_move_sensitivity_factor);
+  if (this->gate_still_sensitivity_factor_number_ != nullptr)
+    this->gate_still_sensitivity_factor_number_->publish_state(this->gate_still_sensitivity_factor);
+  for (uint8_t gate = 0; gate < LD2420_TOTAL_GATES; gate++) {
+    if (this->gate_still_threshold_numbers_[gate] != nullptr) {
+      this->gate_still_threshold_numbers_[gate]->publish_state(
+          static_cast<uint16_t>(this->current_config.still_thresh[gate]));
+    }
+    if (this->gate_move_threshold_numbers_[gate] != nullptr) {
+      this->gate_move_threshold_numbers_[gate]->publish_state(
+          static_cast<uint16_t>(this->current_config.move_thresh[gate]));
+    }
+  }
+}
+
+void LD2420Component::refresh_gate_config_numbers() {
+  this->gate_timeout_number_->publish_state(this->new_config.timeout);
+  this->min_gate_distance_number_->publish_state(this->new_config.min_gate);
+  this->max_gate_distance_number_->publish_state(this->new_config.max_gate);
+}
+
+#endif
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/ld2420.h b/esphome/components/ld2420/ld2420.h
new file mode 100644
index 0000000000..2780503776
--- /dev/null
+++ b/esphome/components/ld2420/ld2420.h
@@ -0,0 +1,272 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/automation.h"
+#include "esphome/core/helpers.h"
+#ifdef USE_TEXT_SENSOR
+#include "esphome/components/text_sensor/text_sensor.h"
+#endif
+#ifdef USE_SELECT
+#include "esphome/components/select/select.h"
+#endif
+#ifdef USE_NUMBER
+#include "esphome/components/number/number.h"
+#endif
+#ifdef USE_BUTTON
+#include "esphome/components/button/button.h"
+#endif
+#include <map>
+#include <functional>
+
+namespace esphome {
+namespace ld2420 {
+
+// Local const's
+static const uint16_t REFRESH_RATE_MS = 1000;
+
+// Command sets
+static const uint8_t CMD_ABD_DATA_REPLY_SIZE = 0x04;
+static const uint8_t CMD_ABD_DATA_REPLY_START = 0x0A;
+static const uint16_t CMD_DISABLE_CONF = 0x00FE;
+static const uint16_t CMD_ENABLE_CONF = 0x00FF;
+static const uint8_t CMD_MAX_BYTES = 0x64;
+static const uint16_t CMD_PARM_HIGH_TRESH = 0x0012;
+static const uint16_t CMD_PARM_LOW_TRESH = 0x0021;
+static const uint16_t CMD_PROTOCOL_VER = 0x0002;
+static const uint16_t CMD_READ_ABD_PARAM = 0x0008;
+static const uint16_t CMD_READ_REG_ADDR = 0x0020;
+static const uint16_t CMD_READ_REGISTER = 0x0002;
+static const uint16_t CMD_READ_SERIAL_NUM = 0x0011;
+static const uint16_t CMD_READ_SYS_PARAM = 0x0013;
+static const uint16_t CMD_READ_VERSION = 0x0000;
+static const uint8_t CMD_REG_DATA_REPLY_SIZE = 0x02;
+static const uint16_t CMD_RESTART = 0x0068;
+static const uint16_t CMD_SYSTEM_MODE = 0x0000;
+static const uint16_t CMD_SYSTEM_MODE_GR = 0x0003;
+static const uint16_t CMD_SYSTEM_MODE_MTT = 0x0001;
+static const uint16_t CMD_SYSTEM_MODE_SIMPLE = 0x0064;
+static const uint16_t CMD_SYSTEM_MODE_DEBUG = 0x0000;
+static const uint16_t CMD_SYSTEM_MODE_ENERGY = 0x0004;
+static const uint16_t CMD_SYSTEM_MODE_VS = 0x0002;
+static const uint16_t CMD_WRITE_ABD_PARAM = 0x0007;
+static const uint16_t CMD_WRITE_REGISTER = 0x0001;
+static const uint16_t CMD_WRITE_SYS_PARAM = 0x0012;
+
+static const uint8_t LD2420_ERROR_NONE = 0x00;
+static const uint8_t LD2420_ERROR_TIMEOUT = 0x02;
+static const uint8_t LD2420_ERROR_UNKNOWN = 0x01;
+static const uint8_t LD2420_TOTAL_GATES = 16;
+static const uint8_t CALIBRATE_SAMPLES = 64;
+
+// Register address values
+static const uint16_t CMD_MIN_GATE_REG = 0x0000;
+static const uint16_t CMD_MAX_GATE_REG = 0x0001;
+static const uint16_t CMD_TIMEOUT_REG = 0x0004;
+static const uint16_t CMD_GATE_MOVE_THRESH[LD2420_TOTAL_GATES] = {0x0010, 0x0011, 0x0012, 0x0013, 0x0014, 0x0015,
+                                                                  0x0016, 0x0017, 0x0018, 0x0019, 0x001A, 0x001B,
+                                                                  0x001C, 0x001D, 0x001E, 0x001F};
+static const uint16_t CMD_GATE_STILL_THRESH[LD2420_TOTAL_GATES] = {0x0020, 0x0021, 0x0022, 0x0023, 0x0024, 0x0025,
+                                                                   0x0026, 0x0027, 0x0028, 0x0029, 0x002A, 0x002B,
+                                                                   0x002C, 0x002D, 0x002E, 0x002F};
+static const uint32_t FACTORY_MOVE_THRESH[LD2420_TOTAL_GATES] = {60000, 30000, 400, 250, 250, 250, 250, 250,
+                                                                 250,   250,   250, 250, 250, 250, 250, 250};
+static const uint32_t FACTORY_STILL_THRESH[LD2420_TOTAL_GATES] = {40000, 20000, 200, 200, 200, 200, 200, 150,
+                                                                  150,   100,   100, 100, 100, 100, 100, 100};
+static const uint16_t FACTORY_TIMEOUT = 120;
+static const uint16_t FACTORY_MIN_GATE = 1;
+static const uint16_t FACTORY_MAX_GATE = 12;
+
+// COMMAND_BYTE Header & Footer
+static const uint8_t CMD_FRAME_COMMAND = 6;
+static const uint8_t CMD_FRAME_DATA_LENGTH = 4;
+static const uint32_t CMD_FRAME_FOOTER = 0x01020304;
+static const uint32_t CMD_FRAME_HEADER = 0xFAFBFCFD;
+static const uint32_t DEBUG_FRAME_FOOTER = 0xFAFBFCFD;
+static const uint32_t DEBUG_FRAME_HEADER = 0x1410BFAA;
+static const uint32_t ENERGY_FRAME_FOOTER = 0xF5F6F7F8;
+static const uint32_t ENERGY_FRAME_HEADER = 0xF1F2F3F4;
+static const uint8_t CMD_FRAME_STATUS = 7;
+static const uint8_t CMD_ERROR_WORD = 8;
+static const uint8_t ENERGY_SENSOR_START = 9;
+static const uint8_t CALIBRATE_REPORT_INTERVAL = 4;
+static const int CALIBRATE_VERSION_MIN = 154;
+static const std::string OP_NORMAL_MODE_STRING = "Normal";
+static const std::string OP_SIMPLE_MODE_STRING = "Simple";
+
+enum OpModeStruct : uint8_t { OP_NORMAL_MODE = 1, OP_CALIBRATE_MODE = 2, OP_SIMPLE_MODE = 3 };
+static const std::map<std::string, uint8_t> OP_MODE_TO_UINT{
+    {"Normal", OP_NORMAL_MODE}, {"Calibrate", OP_CALIBRATE_MODE}, {"Simple", OP_SIMPLE_MODE}};
+static constexpr const char *ERR_MESSAGE[] = {"None", "Unknown", "Timeout"};
+
+class LD2420Listener {
+ public:
+  virtual void on_presence(bool presence){};
+  virtual void on_distance(uint16_t distance){};
+  virtual void on_energy(uint16_t *sensor_energy, size_t size){};
+  virtual void on_fw_version(std::string &fw){};
+};
+
+class LD2420Component : public Component, public uart::UARTDevice {
+ public:
+  void setup() override;
+  void dump_config() override;
+  void loop() override;
+#ifdef USE_SELECT
+  void set_operating_mode_select(select::Select *selector) { this->operating_selector_ = selector; };
+#endif
+#ifdef USE_NUMBER
+  void set_gate_timeout_number(number::Number *number) { this->gate_timeout_number_ = number; };
+  void set_gate_select_number(number::Number *number) { this->gate_select_number_ = number; };
+  void set_min_gate_distance_number(number::Number *number) { this->min_gate_distance_number_ = number; };
+  void set_max_gate_distance_number(number::Number *number) { this->max_gate_distance_number_ = number; };
+  void set_gate_move_sensitivity_factor_number(number::Number *number) {
+    this->gate_move_sensitivity_factor_number_ = number;
+  };
+  void set_gate_still_sensitivity_factor_number(number::Number *number) {
+    this->gate_still_sensitivity_factor_number_ = number;
+  };
+  void set_gate_still_threshold_numbers(int gate, number::Number *n) { this->gate_still_threshold_numbers_[gate] = n; };
+  void set_gate_move_threshold_numbers(int gate, number::Number *n) { this->gate_move_threshold_numbers_[gate] = n; };
+  bool is_gate_select() { return gate_select_number_ != nullptr; };
+  uint8_t get_gate_select_value() { return static_cast<uint8_t>(this->gate_select_number_->state); };
+  float get_min_gate_distance_value() { return min_gate_distance_number_->state; };
+  float get_max_gate_distance_value() { return max_gate_distance_number_->state; };
+  void publish_gate_move_threshold(uint8_t gate) {
+    // With gate_select we only use 1 number pointer, thus we hard code [0]
+    this->gate_move_threshold_numbers_[0]->publish_state(this->new_config.move_thresh[gate]);
+  };
+  void publish_gate_still_threshold(uint8_t gate) {
+    this->gate_still_threshold_numbers_[0]->publish_state(this->new_config.still_thresh[gate]);
+  };
+  void init_gate_config_numbers();
+  void refresh_gate_config_numbers();
+#endif
+#ifdef USE_BUTTON
+  void set_apply_config_button(button::Button *button) { this->apply_config_button_ = button; };
+  void set_revert_config_button(button::Button *button) { this->revert_config_button_ = button; };
+  void set_restart_module_button(button::Button *button) { this->restart_module_button_ = button; };
+  void set_factory_reset_button(button::Button *button) { this->factory_reset_button_ = button; };
+#endif
+  void register_listener(LD2420Listener *listener) { this->listeners_.push_back(listener); }
+
+  struct CmdFrameT {
+    uint32_t header{0};
+    uint16_t length{0};
+    uint16_t command{0};
+    uint8_t data[18];
+    uint16_t data_length{0};
+    uint32_t footer{0};
+  };
+
+  struct RegConfigT {
+    uint16_t min_gate{0};
+    uint16_t max_gate{0};
+    uint16_t timeout{0};
+    uint32_t move_thresh[LD2420_TOTAL_GATES];
+    uint32_t still_thresh[LD2420_TOTAL_GATES];
+  };
+
+  void send_module_restart();
+  void restart_module_action();
+  void apply_config_action();
+  void factory_reset_action();
+  void revert_config_action();
+  float get_setup_priority() const override;
+  int send_cmd_from_array(CmdFrameT cmd_frame);
+  void report_gate_data();
+  void handle_cmd_error(uint8_t error);
+  void set_operating_mode(const std::string &state);
+  void auto_calibrate_sensitivity();
+  void update_radar_data(uint16_t const *gate_energy, uint8_t sample_number);
+  uint8_t calc_checksum(void *data, size_t size);
+
+  RegConfigT current_config;
+  RegConfigT new_config;
+  int32_t last_periodic_millis = millis();
+  int32_t report_periodic_millis = millis();
+  int32_t monitor_periodic_millis = millis();
+  int32_t last_normal_periodic_millis = millis();
+  bool output_energy_state{false};
+  uint8_t current_operating_mode{OP_NORMAL_MODE};
+  uint16_t radar_data[LD2420_TOTAL_GATES][CALIBRATE_SAMPLES];
+  uint16_t gate_avg[LD2420_TOTAL_GATES];
+  uint16_t gate_peak[LD2420_TOTAL_GATES];
+  uint8_t sample_number_counter{0};
+  uint16_t total_sample_number_counter{0};
+  float gate_move_sensitivity_factor{0.5};
+  float gate_still_sensitivity_factor{0.5};
+#ifdef USE_SELECT
+  select::Select *operating_selector_{nullptr};
+#endif
+#ifdef USE_BUTTON
+  button::Button *apply_config_button_{nullptr};
+  button::Button *revert_config_button_{nullptr};
+  button::Button *restart_module_button_{nullptr};
+  button::Button *factory_reset_button_{nullptr};
+#endif
+  void set_min_max_distances_timeout(uint32_t max_gate_distance, uint32_t min_gate_distance, uint32_t timeout);
+  void set_gate_threshold(uint8_t gate);
+  void set_reg_value(uint16_t reg, uint16_t value);
+  uint8_t set_config_mode(bool enable);
+  void set_system_mode(uint16_t mode);
+  void ld2420_restart();
+
+ protected:
+  struct CmdReplyT {
+    uint8_t command;
+    uint8_t status;
+    uint32_t data[4];
+    uint8_t length;
+    uint16_t error;
+    volatile bool ack;
+  };
+
+  int get_firmware_int_(const char *version_string);
+  void get_firmware_version_();
+  int get_gate_threshold_(uint8_t gate);
+  void get_reg_value_(uint16_t reg);
+  int get_min_max_distances_timeout_();
+  uint16_t get_mode_() { return this->system_mode_; };
+  void set_mode_(uint16_t mode) { this->system_mode_ = mode; };
+  bool get_presence_() { return this->presence_; };
+  void set_presence_(bool presence) { this->presence_ = presence; };
+  uint16_t get_distance_() { return this->distance_; };
+  void set_distance_(uint16_t distance) { this->distance_ = distance; };
+  bool get_cmd_active_() { return this->cmd_active_; };
+  void set_cmd_active_(bool active) { this->cmd_active_ = active; };
+  void handle_simple_mode_(const uint8_t *inbuf, int len);
+  void handle_energy_mode_(uint8_t *buffer, int len);
+  void handle_ack_data_(uint8_t *buffer, int len);
+  void readline_(int rx_data, uint8_t *buffer, int len);
+  void set_calibration_(bool state) { this->calibration_ = state; };
+  bool get_calibration_() { return this->calibration_; };
+
+#ifdef USE_NUMBER
+  number::Number *gate_timeout_number_{nullptr};
+  number::Number *gate_select_number_{nullptr};
+  number::Number *min_gate_distance_number_{nullptr};
+  number::Number *max_gate_distance_number_{nullptr};
+  number::Number *gate_move_sensitivity_factor_number_{nullptr};
+  number::Number *gate_still_sensitivity_factor_number_{nullptr};
+  std::vector<number::Number *> gate_still_threshold_numbers_ = std::vector<number::Number *>(16);
+  std::vector<number::Number *> gate_move_threshold_numbers_ = std::vector<number::Number *>(16);
+#endif
+
+  uint16_t gate_energy_[LD2420_TOTAL_GATES];
+  CmdReplyT cmd_reply_;
+  uint32_t timeout_;
+  uint32_t max_distance_gate_;
+  uint32_t min_distance_gate_;
+  uint16_t system_mode_{CMD_SYSTEM_MODE_ENERGY};
+  bool cmd_active_{false};
+  char ld2420_firmware_ver_[8];
+  bool presence_{false};
+  bool calibration_{false};
+  uint16_t distance_{0};
+  uint8_t config_checksum_{0};
+  std::vector<LD2420Listener *> listeners_{};
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/number/__init__.py b/esphome/components/ld2420/number/__init__.py
new file mode 100644
index 0000000000..4ae08356fc
--- /dev/null
+++ b/esphome/components/ld2420/number/__init__.py
@@ -0,0 +1,183 @@
+import esphome.codegen as cg
+from esphome.components import number
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    DEVICE_CLASS_DISTANCE,
+    UNIT_SECOND,
+    ENTITY_CATEGORY_CONFIG,
+    ICON_MOTION_SENSOR,
+    ICON_TIMELAPSE,
+    ICON_SCALE,
+)
+from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
+
+LD2420TimeoutNumber = ld2420_ns.class_("LD2420TimeoutNumber", number.Number)
+LD2420MoveSensFactorNumber = ld2420_ns.class_(
+    "LD2420MoveSensFactorNumber", number.Number
+)
+LD2420StillSensFactorNumber = ld2420_ns.class_(
+    "LD2420StillSensFactorNumber", number.Number
+)
+LD2420MinDistanceNumber = ld2420_ns.class_("LD2420MinDistanceNumber", number.Number)
+LD2420MaxDistanceNumber = ld2420_ns.class_("LD2420MaxDistanceNumber", number.Number)
+LD2420GateSelectNumber = ld2420_ns.class_("LD2420GateSelectNumber", number.Number)
+LD2420MoveThresholdNumbers = ld2420_ns.class_(
+    "LD2420MoveThresholdNumbers", number.Number
+)
+LD2420StillThresholdNumbers = ld2420_ns.class_(
+    "LD2420StillThresholdNumbers", number.Number
+)
+CONF_MIN_GATE_DISTANCE = "min_gate_distance"
+CONF_MAX_GATE_DISTANCE = "max_gate_distance"
+CONF_STILL_THRESHOLD = "still_threshold"
+CONF_MOVE_THRESHOLD = "move_threshold"
+CONF_GATE_MOVE_SENSITIVITY = "gate_move_sensitivity"
+CONF_GATE_STILL_SENSITIVITY = "gate_still_sensitivity"
+CONF_GATE_SELECT = "gate_select"
+CONF_PRESENCE_TIMEOUT = "presence_timeout"
+GATE_GROUP = "gate_group"
+TIMEOUT_GROUP = "timeout_group"
+
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+        cv.Inclusive(CONF_PRESENCE_TIMEOUT, TIMEOUT_GROUP): number.number_schema(
+            LD2420TimeoutNumber,
+            unit_of_measurement=UNIT_SECOND,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_TIMELAPSE,
+        ),
+        cv.Inclusive(CONF_MIN_GATE_DISTANCE, TIMEOUT_GROUP): number.number_schema(
+            LD2420MinDistanceNumber,
+            device_class=DEVICE_CLASS_DISTANCE,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_MOTION_SENSOR,
+        ),
+        cv.Inclusive(CONF_MAX_GATE_DISTANCE, TIMEOUT_GROUP): number.number_schema(
+            LD2420MaxDistanceNumber,
+            device_class=DEVICE_CLASS_DISTANCE,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_MOTION_SENSOR,
+        ),
+        cv.Inclusive(CONF_GATE_SELECT, GATE_GROUP): number.number_schema(
+            LD2420GateSelectNumber,
+            device_class=DEVICE_CLASS_DISTANCE,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_MOTION_SENSOR,
+        ),
+        cv.Inclusive(CONF_STILL_THRESHOLD, GATE_GROUP): number.number_schema(
+            LD2420StillThresholdNumbers,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_MOTION_SENSOR,
+        ),
+        cv.Inclusive(CONF_MOVE_THRESHOLD, GATE_GROUP): number.number_schema(
+            LD2420MoveThresholdNumbers,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_MOTION_SENSOR,
+        ),
+        cv.Optional(CONF_GATE_MOVE_SENSITIVITY): number.number_schema(
+            LD2420MoveSensFactorNumber,
+            device_class=DEVICE_CLASS_DISTANCE,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_SCALE,
+        ),
+        cv.Optional(CONF_GATE_STILL_SENSITIVITY): number.number_schema(
+            LD2420StillSensFactorNumber,
+            device_class=DEVICE_CLASS_DISTANCE,
+            entity_category=ENTITY_CATEGORY_CONFIG,
+            icon=ICON_SCALE,
+        ),
+    }
+)
+CONFIG_SCHEMA = CONFIG_SCHEMA.extend(
+    {
+        cv.Optional(f"gate_{x}"): (
+            {
+                cv.Required(CONF_MOVE_THRESHOLD): number.number_schema(
+                    LD2420MoveThresholdNumbers,
+                    entity_category=ENTITY_CATEGORY_CONFIG,
+                    icon=ICON_MOTION_SENSOR,
+                ),
+                cv.Required(CONF_STILL_THRESHOLD): number.number_schema(
+                    LD2420StillThresholdNumbers,
+                    entity_category=ENTITY_CATEGORY_CONFIG,
+                    icon=ICON_MOTION_SENSOR,
+                ),
+            }
+        )
+        for x in range(16)
+    }
+)
+
+
+async def to_code(config):
+    LD2420_component = await cg.get_variable(config[CONF_LD2420_ID])
+    if gate_timeout_config := config.get(CONF_PRESENCE_TIMEOUT):
+        n = await number.new_number(
+            gate_timeout_config, min_value=0, max_value=255, step=5
+        )
+        await cg.register_parented(n, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_gate_timeout_number(n))
+    if min_distance_gate_config := config.get(CONF_MIN_GATE_DISTANCE):
+        n = await number.new_number(
+            min_distance_gate_config, min_value=0, max_value=15, step=1
+        )
+        await cg.register_parented(n, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_min_gate_distance_number(n))
+    if max_distance_gate_config := config.get(CONF_MAX_GATE_DISTANCE):
+        n = await number.new_number(
+            max_distance_gate_config, min_value=1, max_value=15, step=1
+        )
+        await cg.register_parented(n, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_max_gate_distance_number(n))
+    if gate_move_sensitivity_config := config.get(CONF_GATE_MOVE_SENSITIVITY):
+        n = await number.new_number(
+            gate_move_sensitivity_config, min_value=0.05, max_value=1, step=0.025
+        )
+        await cg.register_parented(n, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_gate_move_sensitivity_factor_number(n))
+    if gate_still_sensitivity_config := config.get(CONF_GATE_STILL_SENSITIVITY):
+        n = await number.new_number(
+            gate_still_sensitivity_config, min_value=0.05, max_value=1, step=0.025
+        )
+        await cg.register_parented(n, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_gate_still_sensitivity_factor_number(n))
+    if config.get(CONF_GATE_SELECT):
+        if gate_number := config.get(CONF_GATE_SELECT):
+            n = await number.new_number(gate_number, min_value=0, max_value=15, step=1)
+            await cg.register_parented(n, config[CONF_LD2420_ID])
+            cg.add(LD2420_component.set_gate_select_number(n))
+        if gate_still_threshold := config.get(CONF_STILL_THRESHOLD):
+            n = cg.new_Pvariable(gate_still_threshold[CONF_ID])
+            await number.register_number(
+                n, gate_still_threshold, min_value=0, max_value=65535, step=25
+            )
+            await cg.register_parented(n, config[CONF_LD2420_ID])
+            cg.add(LD2420_component.set_gate_still_threshold_numbers(0, n))
+        if gate_move_threshold := config.get(CONF_MOVE_THRESHOLD):
+            n = cg.new_Pvariable(gate_move_threshold[CONF_ID])
+            await number.register_number(
+                n, gate_move_threshold, min_value=0, max_value=65535, step=25
+            )
+            await cg.register_parented(n, config[CONF_LD2420_ID])
+            cg.add(LD2420_component.set_gate_move_threshold_numbers(0, n))
+    else:
+        for x in range(16):
+            if gate_conf := config.get(f"gate_{x}"):
+                move_config = gate_conf[CONF_MOVE_THRESHOLD]
+                n = cg.new_Pvariable(move_config[CONF_ID], x)
+                await number.register_number(
+                    n, move_config, min_value=0, max_value=65535, step=25
+                )
+                await cg.register_parented(n, config[CONF_LD2420_ID])
+                cg.add(LD2420_component.set_gate_move_threshold_numbers(x, n))
+
+                still_config = gate_conf[CONF_STILL_THRESHOLD]
+                n = cg.new_Pvariable(still_config[CONF_ID], x)
+                await number.register_number(
+                    n, still_config, min_value=0, max_value=65535, step=25
+                )
+                await cg.register_parented(n, config[CONF_LD2420_ID])
+                cg.add(LD2420_component.set_gate_still_threshold_numbers(x, n))
diff --git a/esphome/components/ld2420/number/gate_config_number.cpp b/esphome/components/ld2420/number/gate_config_number.cpp
new file mode 100644
index 0000000000..e5eaafb46d
--- /dev/null
+++ b/esphome/components/ld2420/number/gate_config_number.cpp
@@ -0,0 +1,73 @@
+#include "gate_config_number.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+static const char *const TAG = "LD2420.number";
+
+namespace esphome {
+namespace ld2420 {
+
+void LD2420TimeoutNumber::control(float timeout) {
+  this->publish_state(timeout);
+  this->parent_->new_config.timeout = timeout;
+}
+
+void LD2420MinDistanceNumber::control(float min_gate) {
+  if ((uint16_t) min_gate > this->parent_->new_config.max_gate) {
+    min_gate = this->parent_->get_min_gate_distance_value();
+  } else {
+    this->parent_->new_config.min_gate = (uint16_t) min_gate;
+  }
+  this->publish_state(min_gate);
+}
+
+void LD2420MaxDistanceNumber::control(float max_gate) {
+  if ((uint16_t) max_gate < this->parent_->new_config.min_gate) {
+    max_gate = this->parent_->get_max_gate_distance_value();
+  } else {
+    this->parent_->new_config.max_gate = (uint16_t) max_gate;
+  }
+  this->publish_state(max_gate);
+}
+
+void LD2420GateSelectNumber::control(float gate_select) {
+  const uint8_t gate = (uint8_t) gate_select;
+  this->publish_state(gate_select);
+  this->parent_->publish_gate_move_threshold(gate);
+  this->parent_->publish_gate_still_threshold(gate);
+}
+
+void LD2420MoveSensFactorNumber::control(float move_factor) {
+  this->publish_state(move_factor);
+  this->parent_->gate_move_sensitivity_factor = move_factor;
+}
+
+void LD2420StillSensFactorNumber::control(float still_factor) {
+  this->publish_state(still_factor);
+  this->parent_->gate_still_sensitivity_factor = still_factor;
+}
+
+LD2420MoveThresholdNumbers::LD2420MoveThresholdNumbers(uint8_t gate) : gate_(gate) {}
+
+void LD2420MoveThresholdNumbers::control(float move_threshold) {
+  this->publish_state(move_threshold);
+  if (!this->parent_->is_gate_select()) {
+    this->parent_->new_config.move_thresh[this->gate_] = move_threshold;
+  } else {
+    this->parent_->new_config.move_thresh[this->parent_->get_gate_select_value()] = move_threshold;
+  }
+}
+
+LD2420StillThresholdNumbers::LD2420StillThresholdNumbers(uint8_t gate) : gate_(gate) {}
+
+void LD2420StillThresholdNumbers::control(float still_threshold) {
+  this->publish_state(still_threshold);
+  if (!this->parent_->is_gate_select()) {
+    this->parent_->new_config.still_thresh[this->gate_] = still_threshold;
+  } else {
+    this->parent_->new_config.still_thresh[this->parent_->get_gate_select_value()] = still_threshold;
+  }
+}
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/number/gate_config_number.h b/esphome/components/ld2420/number/gate_config_number.h
new file mode 100644
index 0000000000..459a8026e3
--- /dev/null
+++ b/esphome/components/ld2420/number/gate_config_number.h
@@ -0,0 +1,78 @@
+#pragma once
+
+#include "esphome/components/number/number.h"
+#include "../ld2420.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420TimeoutNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420TimeoutNumber() = default;
+
+ protected:
+  void control(float timeout) override;
+};
+
+class LD2420MinDistanceNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420MinDistanceNumber() = default;
+
+ protected:
+  void control(float min_gate) override;
+};
+
+class LD2420MaxDistanceNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420MaxDistanceNumber() = default;
+
+ protected:
+  void control(float max_gate) override;
+};
+
+class LD2420GateSelectNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420GateSelectNumber() = default;
+
+ protected:
+  void control(float gate_select) override;
+};
+
+class LD2420MoveSensFactorNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420MoveSensFactorNumber() = default;
+
+ protected:
+  void control(float move_factor) override;
+};
+
+class LD2420StillSensFactorNumber : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420StillSensFactorNumber() = default;
+
+ protected:
+  void control(float still_factor) override;
+};
+
+class LD2420StillThresholdNumbers : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420StillThresholdNumbers() = default;
+  LD2420StillThresholdNumbers(uint8_t gate);
+
+ protected:
+  uint8_t gate_;
+  void control(float still_threshold) override;
+};
+
+class LD2420MoveThresholdNumbers : public number::Number, public Parented<LD2420Component> {
+ public:
+  LD2420MoveThresholdNumbers() = default;
+  LD2420MoveThresholdNumbers(uint8_t gate);
+
+ protected:
+  uint8_t gate_;
+  void control(float move_threshold) override;
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/select/__init__.py b/esphome/components/ld2420/select/__init__.py
new file mode 100644
index 0000000000..554bd4147d
--- /dev/null
+++ b/esphome/components/ld2420/select/__init__.py
@@ -0,0 +1,33 @@
+import esphome.codegen as cg
+from esphome.components import select
+import esphome.config_validation as cv
+from esphome.const import ENTITY_CATEGORY_CONFIG
+from .. import CONF_LD2420_ID, LD2420Component, ld2420_ns
+
+CONF_OPERATING_MODE = "operating_mode"
+CONF_SELECTS = [
+    "Normal",
+    "Calibrate",
+    "Simple",
+]
+
+LD2420Select = ld2420_ns.class_("LD2420Select", cg.Component)
+
+CONFIG_SCHEMA = {
+    cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+    cv.Required(CONF_OPERATING_MODE): select.select_schema(
+        LD2420Select,
+        entity_category=ENTITY_CATEGORY_CONFIG,
+    ),
+}
+
+
+async def to_code(config):
+    LD2420_component = await cg.get_variable(config[CONF_LD2420_ID])
+    if operating_mode_config := config.get(CONF_OPERATING_MODE):
+        sel = await select.new_select(
+            operating_mode_config,
+            options=[CONF_SELECTS],
+        )
+        await cg.register_parented(sel, config[CONF_LD2420_ID])
+        cg.add(LD2420_component.set_operating_mode_select(sel))
diff --git a/esphome/components/ld2420/select/operating_mode_select.cpp b/esphome/components/ld2420/select/operating_mode_select.cpp
new file mode 100644
index 0000000000..1c59f443a5
--- /dev/null
+++ b/esphome/components/ld2420/select/operating_mode_select.cpp
@@ -0,0 +1,16 @@
+#include "operating_mode_select.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ld2420 {
+
+static const char *const TAG = "LD2420.select";
+
+void LD2420Select::control(const std::string &value) {
+  this->publish_state(value);
+  this->parent_->set_operating_mode(value);
+}
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/select/operating_mode_select.h b/esphome/components/ld2420/select/operating_mode_select.h
new file mode 100644
index 0000000000..317b2af8c0
--- /dev/null
+++ b/esphome/components/ld2420/select/operating_mode_select.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "../ld2420.h"
+#include "esphome/components/select/select.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420Select : public Component, public select::Select, public Parented<LD2420Component> {
+ public:
+  LD2420Select() = default;
+
+ protected:
+  void control(const std::string &value) override;
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/sensor/__init__.py b/esphome/components/ld2420/sensor/__init__.py
new file mode 100644
index 0000000000..6a67d1fc41
--- /dev/null
+++ b/esphome/components/ld2420/sensor/__init__.py
@@ -0,0 +1,35 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import CONF_ID, DEVICE_CLASS_DISTANCE, UNIT_CENTIMETER
+from .. import ld2420_ns, LD2420Component, CONF_LD2420_ID
+
+LD2420Sensor = ld2420_ns.class_("LD2420Sensor", sensor.Sensor, cg.Component)
+
+CONF_MOVING_DISTANCE = "moving_distance"
+CONF_GATE_ENERGY = "gate_energy"
+
+CONFIG_SCHEMA = cv.All(
+    cv.COMPONENT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(LD2420Sensor),
+            cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+            cv.Optional(CONF_MOVING_DISTANCE): sensor.sensor_schema(
+                device_class=DEVICE_CLASS_DISTANCE, unit_of_measurement=UNIT_CENTIMETER
+            ),
+        }
+    ),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    if CONF_MOVING_DISTANCE in config:
+        sens = await sensor.new_sensor(config[CONF_MOVING_DISTANCE])
+        cg.add(var.set_distance_sensor(sens))
+    if CONF_GATE_ENERGY in config:
+        sens = await sensor.new_sensor(config[CONF_GATE_ENERGY])
+        cg.add(var.set_energy_sensor(sens))
+    ld2420 = await cg.get_variable(config[CONF_LD2420_ID])
+    cg.add(ld2420.register_listener(var))
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.cpp b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
new file mode 100644
index 0000000000..97f0c594b7
--- /dev/null
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.cpp
@@ -0,0 +1,16 @@
+#include "ld2420_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ld2420 {
+
+static const char *const TAG = "LD2420.sensor";
+
+void LD2420Sensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "LD2420 Sensor:");
+  LOG_SENSOR("  ", "Distance", this->distance_sensor_);
+}
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/sensor/ld2420_sensor.h b/esphome/components/ld2420/sensor/ld2420_sensor.h
new file mode 100644
index 0000000000..4eebefe0e3
--- /dev/null
+++ b/esphome/components/ld2420/sensor/ld2420_sensor.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "../ld2420.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420Sensor : public LD2420Listener, public Component, sensor::Sensor {
+ public:
+  void dump_config() override;
+  void set_distance_sensor(sensor::Sensor *sensor) { this->distance_sensor_ = sensor; }
+  void on_distance(uint16_t distance) override {
+    if (this->distance_sensor_ != nullptr) {
+      if (this->distance_sensor_->get_state() != distance) {
+        this->distance_sensor_->publish_state(distance);
+      }
+    }
+  }
+  void on_energy(uint16_t *gate_energy, size_t size) override {
+    for (size_t active = 0; active < size; active++) {
+      if (this->energy_sensors_[active] != nullptr) {
+        this->energy_sensors_[active]->publish_state(gate_energy[active]);
+      }
+    }
+  }
+
+ protected:
+  sensor::Sensor *distance_sensor_{nullptr};
+  std::vector<sensor::Sensor *> energy_sensors_ = std::vector<sensor::Sensor *>(LD2420_TOTAL_GATES);
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/text_sensor/__init__.py b/esphome/components/ld2420/text_sensor/__init__.py
new file mode 100644
index 0000000000..b6d8c7c0e4
--- /dev/null
+++ b/esphome/components/ld2420/text_sensor/__init__.py
@@ -0,0 +1,38 @@
+import esphome.codegen as cg
+from esphome.components import text_sensor
+import esphome.config_validation as cv
+from esphome.const import (
+    CONF_ID,
+    ENTITY_CATEGORY_DIAGNOSTIC,
+    ICON_CHIP,
+)
+
+from .. import ld2420_ns, LD2420Component, CONF_LD2420_ID
+
+LD2420TextSensor = ld2420_ns.class_(
+    "LD2420TextSensor", text_sensor.TextSensor, cg.Component
+)
+
+CONF_FW_VERSION = "fw_version"
+
+CONFIG_SCHEMA = cv.All(
+    cv.COMPONENT_SCHEMA.extend(
+        {
+            cv.GenerateID(): cv.declare_id(LD2420TextSensor),
+            cv.GenerateID(CONF_LD2420_ID): cv.use_id(LD2420Component),
+            cv.Optional(CONF_FW_VERSION): text_sensor.text_sensor_schema(
+                entity_category=ENTITY_CATEGORY_DIAGNOSTIC, icon=ICON_CHIP
+            ),
+        }
+    ),
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    if CONF_FW_VERSION in config:
+        sens = await text_sensor.new_text_sensor(config[CONF_FW_VERSION])
+        cg.add(var.set_fw_version_text_sensor(sens))
+    ld2420 = await cg.get_variable(config[CONF_LD2420_ID])
+    cg.add(ld2420.register_listener(var))
diff --git a/esphome/components/ld2420/text_sensor/text_sensor.cpp b/esphome/components/ld2420/text_sensor/text_sensor.cpp
new file mode 100644
index 0000000000..1dcdcf7d60
--- /dev/null
+++ b/esphome/components/ld2420/text_sensor/text_sensor.cpp
@@ -0,0 +1,16 @@
+#include "text_sensor.h"
+#include "esphome/core/helpers.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ld2420 {
+
+static const char *const TAG = "LD2420.text_sensor";
+
+void LD2420TextSensor::dump_config() {
+  ESP_LOGCONFIG(TAG, "LD2420 TextSensor:");
+  LOG_TEXT_SENSOR("  ", "Firmware", this->fw_version_text_sensor_);
+}
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/esphome/components/ld2420/text_sensor/text_sensor.h b/esphome/components/ld2420/text_sensor/text_sensor.h
new file mode 100644
index 0000000000..073ddd5d0f
--- /dev/null
+++ b/esphome/components/ld2420/text_sensor/text_sensor.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "../ld2420.h"
+#include "esphome/components/text_sensor/text_sensor.h"
+
+namespace esphome {
+namespace ld2420 {
+
+class LD2420TextSensor : public LD2420Listener, public Component, text_sensor::TextSensor {
+ public:
+  void dump_config() override;
+  void set_fw_version_text_sensor(text_sensor::TextSensor *tsensor) { this->fw_version_text_sensor_ = tsensor; };
+  void on_fw_version(std::string &fw) override {
+    if (this->fw_version_text_sensor_ != nullptr) {
+      this->fw_version_text_sensor_->publish_state(fw);
+    }
+  }
+
+ protected:
+  text_sensor::TextSensor *fw_version_text_sensor_{nullptr};
+};
+
+}  // namespace ld2420
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 1498dac69d..da6227e235 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -224,6 +224,12 @@ uart:
     tx_pin: 14
     rx_pin: 27
     baud_rate: 115200
+  - id: ld2420_uart
+    tx_pin: 17
+    rx_pin: 16
+    baud_rate: 115200
+    parity: NONE
+    stop_bits: 1
   - id: gcja5_uart
     rx_pin: GPIO10
     parity: EVEN
@@ -1441,6 +1447,9 @@ sensor:
       still_energy:
         name: g8 still energy
 
+  - platform: ld2420
+    moving_distance:
+      name: "Moving distance (cm)"
   - platform: sen21231
     name: "Person Sensor"
     i2c_id: i2c_bus
@@ -3615,6 +3624,10 @@ ld2410:
   id: my_ld2410
   uart_id: ld2410_uart
 
+ld2420:
+  id: my_ld2420
+  uart_id: ld2420_uart
+
 lcd_menu:
   display_id: my_lcd_gpio
   mark_back: 0x5e

From 13994d9bd10653c07ec97badba14e742a3c6c54b Mon Sep 17 00:00:00 2001
From: Joris S <100357138+Jorre05@users.noreply.github.com>
Date: Fri, 3 Nov 2023 07:54:47 +0100
Subject: [PATCH 107/131] Add Micronova component (#4760)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Co-authored-by: Graham Brown <grahambrown11@gmail.com>
---
 CODEOWNERS                                    |   1 +
 esphome/components/micronova/__init__.py      |  69 +++++++
 .../components/micronova/button/__init__.py   |  44 +++++
 .../micronova/button/micronova_button.cpp     |  18 ++
 .../micronova/button/micronova_button.h       |  23 +++
 esphome/components/micronova/micronova.cpp    | 148 +++++++++++++++
 esphome/components/micronova/micronova.h      | 164 +++++++++++++++++
 .../components/micronova/number/__init__.py   | 110 +++++++++++
 .../micronova/number/micronova_number.cpp     |  45 +++++
 .../micronova/number/micronova_number.h       |  28 +++
 .../components/micronova/sensor/__init__.py   | 172 ++++++++++++++++++
 .../micronova/sensor/micronova_sensor.cpp     |  35 ++++
 .../micronova/sensor/micronova_sensor.h       |  27 +++
 .../components/micronova/switch/__init__.py   |  56 ++++++
 .../micronova/switch/micronova_switch.cpp     |  33 ++++
 .../micronova/switch/micronova_switch.h       |  29 +++
 .../micronova/text_sensor/__init__.py         |  43 +++++
 .../text_sensor/micronova_text_sensor.cpp     |  31 ++++
 .../text_sensor/micronova_text_sensor.h       |  20 ++
 tests/test1.yaml                              |  38 ++++
 20 files changed, 1134 insertions(+)
 create mode 100644 esphome/components/micronova/__init__.py
 create mode 100644 esphome/components/micronova/button/__init__.py
 create mode 100644 esphome/components/micronova/button/micronova_button.cpp
 create mode 100644 esphome/components/micronova/button/micronova_button.h
 create mode 100644 esphome/components/micronova/micronova.cpp
 create mode 100644 esphome/components/micronova/micronova.h
 create mode 100644 esphome/components/micronova/number/__init__.py
 create mode 100644 esphome/components/micronova/number/micronova_number.cpp
 create mode 100644 esphome/components/micronova/number/micronova_number.h
 create mode 100644 esphome/components/micronova/sensor/__init__.py
 create mode 100644 esphome/components/micronova/sensor/micronova_sensor.cpp
 create mode 100644 esphome/components/micronova/sensor/micronova_sensor.h
 create mode 100644 esphome/components/micronova/switch/__init__.py
 create mode 100644 esphome/components/micronova/switch/micronova_switch.cpp
 create mode 100644 esphome/components/micronova/switch/micronova_switch.h
 create mode 100644 esphome/components/micronova/text_sensor/__init__.py
 create mode 100644 esphome/components/micronova/text_sensor/micronova_text_sensor.cpp
 create mode 100644 esphome/components/micronova/text_sensor/micronova_text_sensor.h

diff --git a/CODEOWNERS b/CODEOWNERS
index bf5f6a233e..b639088900 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -184,6 +184,7 @@ esphome/components/mcp9808/* @k7hpn
 esphome/components/md5/* @esphome/core
 esphome/components/mdns/* @esphome/core
 esphome/components/media_player/* @jesserockz
+esphome/components/micronova/* @jorre05
 esphome/components/microphone/* @jesserockz
 esphome/components/mics_4514/* @jesserockz
 esphome/components/midea/* @dudanov
diff --git a/esphome/components/micronova/__init__.py b/esphome/components/micronova/__init__.py
new file mode 100644
index 0000000000..bd253f8ebd
--- /dev/null
+++ b/esphome/components/micronova/__init__.py
@@ -0,0 +1,69 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome import pins
+from esphome.components import uart
+from esphome.const import (
+    CONF_ID,
+)
+
+CODEOWNERS = ["@jorre05"]
+
+DEPENDENCIES = ["uart"]
+
+CONF_MICRONOVA_ID = "micronova_id"
+CONF_ENABLE_RX_PIN = "enable_rx_pin"
+CONF_MEMORY_LOCATION = "memory_location"
+CONF_MEMORY_ADDRESS = "memory_address"
+
+micronova_ns = cg.esphome_ns.namespace("micronova")
+
+MicroNovaFunctions = micronova_ns.enum("MicroNovaFunctions", is_class=True)
+MICRONOVA_FUNCTIONS_ENUM = {
+    "STOVE_FUNCTION_SWITCH": MicroNovaFunctions.STOVE_FUNCTION_SWITCH,
+    "STOVE_FUNCTION_ROOM_TEMPERATURE": MicroNovaFunctions.STOVE_FUNCTION_ROOM_TEMPERATURE,
+    "STOVE_FUNCTION_THERMOSTAT_TEMPERATURE": MicroNovaFunctions.STOVE_FUNCTION_THERMOSTAT_TEMPERATURE,
+    "STOVE_FUNCTION_FUMES_TEMPERATURE": MicroNovaFunctions.STOVE_FUNCTION_FUMES_TEMPERATURE,
+    "STOVE_FUNCTION_STOVE_POWER": MicroNovaFunctions.STOVE_FUNCTION_STOVE_POWER,
+    "STOVE_FUNCTION_FAN_SPEED": MicroNovaFunctions.STOVE_FUNCTION_FAN_SPEED,
+    "STOVE_FUNCTION_STOVE_STATE": MicroNovaFunctions.STOVE_FUNCTION_STOVE_STATE,
+    "STOVE_FUNCTION_MEMORY_ADDRESS_SENSOR": MicroNovaFunctions.STOVE_FUNCTION_MEMORY_ADDRESS_SENSOR,
+    "STOVE_FUNCTION_WATER_TEMPERATURE": MicroNovaFunctions.STOVE_FUNCTION_WATER_TEMPERATURE,
+    "STOVE_FUNCTION_WATER_PRESSURE": MicroNovaFunctions.STOVE_FUNCTION_WATER_PRESSURE,
+    "STOVE_FUNCTION_POWER_LEVEL": MicroNovaFunctions.STOVE_FUNCTION_POWER_LEVEL,
+    "STOVE_FUNCTION_CUSTOM": MicroNovaFunctions.STOVE_FUNCTION_CUSTOM,
+}
+
+MicroNova = micronova_ns.class_("MicroNova", cg.PollingComponent, uart.UARTDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(MicroNova),
+            cv.Required(CONF_ENABLE_RX_PIN): pins.gpio_output_pin_schema,
+        }
+    )
+    .extend(uart.UART_DEVICE_SCHEMA)
+    .extend(cv.polling_component_schema("60s"))
+)
+
+
+def MICRONOVA_LISTENER_SCHEMA(default_memory_location, default_memory_address):
+    return cv.Schema(
+        {
+            cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+            cv.Optional(
+                CONF_MEMORY_LOCATION, default=default_memory_location
+            ): cv.hex_int_range(),
+            cv.Optional(
+                CONF_MEMORY_ADDRESS, default=default_memory_address
+            ): cv.hex_int_range(),
+        }
+    )
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await uart.register_uart_device(var, config)
+    enable_rx_pin = await cg.gpio_pin_expression(config[CONF_ENABLE_RX_PIN])
+    cg.add(var.set_enable_rx_pin(enable_rx_pin))
diff --git a/esphome/components/micronova/button/__init__.py b/esphome/components/micronova/button/__init__.py
new file mode 100644
index 0000000000..442f69c08b
--- /dev/null
+++ b/esphome/components/micronova/button/__init__.py
@@ -0,0 +1,44 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import button
+
+from .. import (
+    MicroNova,
+    MicroNovaFunctions,
+    CONF_MICRONOVA_ID,
+    CONF_MEMORY_LOCATION,
+    CONF_MEMORY_ADDRESS,
+    MICRONOVA_LISTENER_SCHEMA,
+    micronova_ns,
+)
+
+MicroNovaButton = micronova_ns.class_("MicroNovaButton", button.Button, cg.Component)
+
+CONF_CUSTOM_BUTTON = "custom_button"
+CONF_MEMORY_DATA = "memory_data"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+        cv.Optional(CONF_CUSTOM_BUTTON): button.button_schema(
+            MicroNovaButton,
+        )
+        .extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0xA0, default_memory_address=0x7D
+            )
+        )
+        .extend({cv.Required(CONF_MEMORY_DATA): cv.hex_int_range()}),
+    }
+)
+
+
+async def to_code(config):
+    mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
+
+    if custom_button_config := config.get(CONF_CUSTOM_BUTTON):
+        bt = await button.new_button(custom_button_config, mv)
+        cg.add(bt.set_memory_location(custom_button_config.get(CONF_MEMORY_LOCATION)))
+        cg.add(bt.set_memory_address(custom_button_config.get(CONF_MEMORY_ADDRESS)))
+        cg.add(bt.set_memory_data(custom_button_config[CONF_MEMORY_DATA]))
+        cg.add(bt.set_function(MicroNovaFunctions.STOVE_FUNCTION_CUSTOM))
diff --git a/esphome/components/micronova/button/micronova_button.cpp b/esphome/components/micronova/button/micronova_button.cpp
new file mode 100644
index 0000000000..c1903fd878
--- /dev/null
+++ b/esphome/components/micronova/button/micronova_button.cpp
@@ -0,0 +1,18 @@
+#include "micronova_button.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNovaButton::press_action() {
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_CUSTOM:
+      this->micronova_->write_address(this->memory_location_, this->memory_address_, this->memory_data_);
+      break;
+    default:
+      break;
+  }
+  this->micronova_->update();
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/button/micronova_button.h b/esphome/components/micronova/button/micronova_button.h
new file mode 100644
index 0000000000..77649051d6
--- /dev/null
+++ b/esphome/components/micronova/button/micronova_button.h
@@ -0,0 +1,23 @@
+#pragma once
+
+#include "esphome/components/micronova/micronova.h"
+#include "esphome/core/component.h"
+#include "esphome/components/button/button.h"
+
+namespace esphome {
+namespace micronova {
+
+class MicroNovaButton : public Component, public button::Button, public MicroNovaButtonListener {
+ public:
+  MicroNovaButton(MicroNova *m) : MicroNovaButtonListener(m) {}
+  void dump_config() override { LOG_BUTTON("", "Micronova button", this); }
+
+  void set_memory_data(uint8_t f) { this->memory_data_ = f; }
+  uint8_t get_memory_data() { return this->memory_data_; }
+
+ protected:
+  void press_action() override;
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/micronova.cpp b/esphome/components/micronova/micronova.cpp
new file mode 100644
index 0000000000..b96798ed12
--- /dev/null
+++ b/esphome/components/micronova/micronova.cpp
@@ -0,0 +1,148 @@
+#include "micronova.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNova::setup() {
+  if (this->enable_rx_pin_ != nullptr) {
+    this->enable_rx_pin_->setup();
+    this->enable_rx_pin_->pin_mode(gpio::FLAG_OUTPUT);
+    this->enable_rx_pin_->digital_write(false);
+  }
+  this->current_transmission_.request_transmission_time = millis();
+  this->current_transmission_.memory_location = 0;
+  this->current_transmission_.memory_address = 0;
+  this->current_transmission_.reply_pending = false;
+  this->current_transmission_.initiating_listener = nullptr;
+}
+
+void MicroNova::dump_config() {
+  ESP_LOGCONFIG(TAG, "MicroNova:");
+  if (this->enable_rx_pin_ != nullptr) {
+    LOG_PIN("  Enable RX Pin: ", this->enable_rx_pin_);
+  }
+
+  for (auto &mv_sensor : this->micronova_listeners_) {
+    mv_sensor->dump_config();
+    ESP_LOGCONFIG(TAG, "    sensor location:%02X, address:%02X", mv_sensor->get_memory_location(),
+                  mv_sensor->get_memory_address());
+  }
+}
+
+void MicroNova::update() {
+  ESP_LOGD(TAG, "Schedule sensor update");
+  for (auto &mv_listener : this->micronova_listeners_) {
+    mv_listener->set_needs_update(true);
+  }
+}
+
+void MicroNova::loop() {
+  // Only read one sensor that needs update per loop
+  // If STOVE_REPLY_DELAY time has passed since last loop()
+  // check for a reply from the stove
+  if ((this->current_transmission_.reply_pending) &&
+      (millis() - this->current_transmission_.request_transmission_time > STOVE_REPLY_DELAY)) {
+    int stove_reply_value = this->read_stove_reply();
+    if (this->current_transmission_.initiating_listener != nullptr) {
+      this->current_transmission_.initiating_listener->process_value_from_stove(stove_reply_value);
+      this->current_transmission_.initiating_listener = nullptr;
+    }
+    this->current_transmission_.reply_pending = false;
+    return;
+  } else if (!this->current_transmission_.reply_pending) {
+    for (auto &mv_listener : this->micronova_listeners_) {
+      if (mv_listener->get_needs_update()) {
+        mv_listener->set_needs_update(false);
+        this->current_transmission_.initiating_listener = mv_listener;
+        mv_listener->request_value_from_stove();
+        return;
+      }
+    }
+  }
+}
+
+void MicroNova::request_address(uint8_t location, uint8_t address, MicroNovaSensorListener *listener) {
+  uint8_t write_data[2] = {0, 0};
+  uint8_t trash_rx;
+
+  if (this->reply_pending_mutex_.try_lock()) {
+    // clear rx buffer.
+    // Stove hickups may cause late replies in the rx
+    while (this->available()) {
+      this->read_byte(&trash_rx);
+      ESP_LOGW(TAG, "Reading excess byte 0x%02X", trash_rx);
+    }
+
+    write_data[0] = location;
+    write_data[1] = address;
+    ESP_LOGV(TAG, "Request from stove [%02X,%02X]", write_data[0], write_data[1]);
+
+    this->enable_rx_pin_->digital_write(true);
+    this->write_array(write_data, 2);
+    this->flush();
+    this->enable_rx_pin_->digital_write(false);
+
+    this->current_transmission_.request_transmission_time = millis();
+    this->current_transmission_.memory_location = location;
+    this->current_transmission_.memory_address = address;
+    this->current_transmission_.reply_pending = true;
+    this->current_transmission_.initiating_listener = listener;
+  } else {
+    ESP_LOGE(TAG, "Reply is pending, skipping read request");
+  }
+}
+
+int MicroNova::read_stove_reply() {
+  uint8_t reply_data[2] = {0, 0};
+  uint8_t checksum = 0;
+
+  // assert enable_rx_pin is false
+  this->read_array(reply_data, 2);
+
+  this->reply_pending_mutex_.unlock();
+  ESP_LOGV(TAG, "Reply from stove [%02X,%02X]", reply_data[0], reply_data[1]);
+
+  checksum = ((uint16_t) this->current_transmission_.memory_location +
+              (uint16_t) this->current_transmission_.memory_address + (uint16_t) reply_data[1]) &
+             0xFF;
+  if (reply_data[0] != checksum) {
+    ESP_LOGE(TAG, "Checksum missmatch! From [0x%02X:0x%02X] received [0x%02X,0x%02X]. Expected 0x%02X, got 0x%02X",
+             this->current_transmission_.memory_location, this->current_transmission_.memory_address, reply_data[0],
+             reply_data[1], checksum, reply_data[0]);
+    return -1;
+  }
+  return ((int) reply_data[1]);
+}
+
+void MicroNova::write_address(uint8_t location, uint8_t address, uint8_t data) {
+  uint8_t write_data[4] = {0, 0, 0, 0};
+  uint16_t checksum = 0;
+
+  if (this->reply_pending_mutex_.try_lock()) {
+    write_data[0] = location;
+    write_data[1] = address;
+    write_data[2] = data;
+
+    checksum = ((uint16_t) write_data[0] + (uint16_t) write_data[1] + (uint16_t) write_data[2]) & 0xFF;
+    write_data[3] = checksum;
+
+    ESP_LOGV(TAG, "Write 4 bytes [%02X,%02X,%02X,%02X]", write_data[0], write_data[1], write_data[2], write_data[3]);
+
+    this->enable_rx_pin_->digital_write(true);
+    this->write_array(write_data, 4);
+    this->flush();
+    this->enable_rx_pin_->digital_write(false);
+
+    this->current_transmission_.request_transmission_time = millis();
+    this->current_transmission_.memory_location = location;
+    this->current_transmission_.memory_address = address;
+    this->current_transmission_.reply_pending = true;
+    this->current_transmission_.initiating_listener = nullptr;
+  } else {
+    ESP_LOGE(TAG, "Reply is pending, skipping write");
+  }
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/micronova.h b/esphome/components/micronova/micronova.h
new file mode 100644
index 0000000000..aebef277e5
--- /dev/null
+++ b/esphome/components/micronova/micronova.h
@@ -0,0 +1,164 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/uart/uart.h"
+#include "esphome/core/log.h"
+#include "esphome/core/defines.h"
+#include "esphome/core/helpers.h"
+
+#include <vector>
+
+namespace esphome {
+namespace micronova {
+
+static const char *const TAG = "micronova";
+static const int STOVE_REPLY_DELAY = 60;
+
+static const std::string STOVE_STATES[11] = {"Off",
+                                             "Start",
+                                             "Pellets loading",
+                                             "Ignition",
+                                             "Working",
+                                             "Brazier Cleaning",
+                                             "Final Cleaning",
+                                             "Standby",
+                                             "No pellets alarm",
+                                             "No ignition alarm",
+                                             "Undefined alarm"};
+
+enum class MicroNovaFunctions {
+  STOVE_FUNCTION_VOID = 0,
+  STOVE_FUNCTION_SWITCH = 1,
+  STOVE_FUNCTION_ROOM_TEMPERATURE = 2,
+  STOVE_FUNCTION_THERMOSTAT_TEMPERATURE = 3,
+  STOVE_FUNCTION_FUMES_TEMPERATURE = 4,
+  STOVE_FUNCTION_STOVE_POWER = 5,
+  STOVE_FUNCTION_FAN_SPEED = 6,
+  STOVE_FUNCTION_STOVE_STATE = 7,
+  STOVE_FUNCTION_MEMORY_ADDRESS_SENSOR = 8,
+  STOVE_FUNCTION_WATER_TEMPERATURE = 9,
+  STOVE_FUNCTION_WATER_PRESSURE = 10,
+  STOVE_FUNCTION_POWER_LEVEL = 11,
+  STOVE_FUNCTION_CUSTOM = 12
+};
+
+class MicroNova;
+
+//////////////////////////////////////////////////////////////////////
+// Interface classes.
+class MicroNovaBaseListener {
+ public:
+  MicroNovaBaseListener() {}
+  MicroNovaBaseListener(MicroNova *m) { this->micronova_ = m; }
+  virtual void dump_config();
+
+  void set_micronova_object(MicroNova *m) { this->micronova_ = m; }
+
+  void set_function(MicroNovaFunctions f) { this->function_ = f; }
+  MicroNovaFunctions get_function() { return this->function_; }
+
+  void set_memory_location(uint8_t l) { this->memory_location_ = l; }
+  uint8_t get_memory_location() { return this->memory_location_; }
+
+  void set_memory_address(uint8_t a) { this->memory_address_ = a; }
+  uint8_t get_memory_address() { return this->memory_address_; }
+
+ protected:
+  MicroNova *micronova_{nullptr};
+  MicroNovaFunctions function_ = MicroNovaFunctions::STOVE_FUNCTION_VOID;
+  uint8_t memory_location_ = 0;
+  uint8_t memory_address_ = 0;
+};
+
+class MicroNovaSensorListener : public MicroNovaBaseListener {
+ public:
+  MicroNovaSensorListener() {}
+  MicroNovaSensorListener(MicroNova *m) : MicroNovaBaseListener(m) {}
+  virtual void request_value_from_stove() = 0;
+  virtual void process_value_from_stove(int value_from_stove) = 0;
+
+  void set_needs_update(bool u) { this->needs_update_ = u; }
+  bool get_needs_update() { return this->needs_update_; }
+
+ protected:
+  bool needs_update_ = false;
+};
+
+class MicroNovaNumberListener : public MicroNovaBaseListener {
+ public:
+  MicroNovaNumberListener(MicroNova *m) : MicroNovaBaseListener(m) {}
+  virtual void request_value_from_stove() = 0;
+  virtual void process_value_from_stove(int value_from_stove) = 0;
+
+  void set_needs_update(bool u) { this->needs_update_ = u; }
+  bool get_needs_update() { return this->needs_update_; }
+
+ protected:
+  bool needs_update_ = false;
+};
+
+class MicroNovaSwitchListener : public MicroNovaBaseListener {
+ public:
+  MicroNovaSwitchListener(MicroNova *m) : MicroNovaBaseListener(m) {}
+  virtual void set_stove_state(bool v) = 0;
+  virtual bool get_stove_state() = 0;
+
+ protected:
+  uint8_t memory_data_on_ = 0;
+  uint8_t memory_data_off_ = 0;
+};
+
+class MicroNovaButtonListener : public MicroNovaBaseListener {
+ public:
+  MicroNovaButtonListener(MicroNova *m) : MicroNovaBaseListener(m) {}
+
+ protected:
+  uint8_t memory_data_ = 0;
+};
+
+/////////////////////////////////////////////////////////////////////
+// Main component class
+class MicroNova : public PollingComponent, public uart::UARTDevice {
+ public:
+  MicroNova() {}
+
+  void setup() override;
+  void loop() override;
+  void update() override;
+  void dump_config() override;
+  void register_micronova_listener(MicroNovaSensorListener *l) { this->micronova_listeners_.push_back(l); }
+
+  void request_address(uint8_t location, uint8_t address, MicroNovaSensorListener *listener);
+  void write_address(uint8_t location, uint8_t address, uint8_t data);
+  int read_stove_reply();
+
+  void set_enable_rx_pin(GPIOPin *enable_rx_pin) { this->enable_rx_pin_ = enable_rx_pin; }
+
+  void set_current_stove_state(uint8_t s) { this->current_stove_state_ = s; }
+  uint8_t get_current_stove_state() { return this->current_stove_state_; }
+
+  void set_stove(MicroNovaSwitchListener *s) { this->stove_switch_ = s; }
+  MicroNovaSwitchListener *get_stove_switch() { return this->stove_switch_; }
+
+ protected:
+  uint8_t current_stove_state_ = 0;
+
+  GPIOPin *enable_rx_pin_{nullptr};
+
+  struct MicroNovaSerialTransmission {
+    uint32_t request_transmission_time;
+    uint8_t memory_location;
+    uint8_t memory_address;
+    bool reply_pending;
+    MicroNovaSensorListener *initiating_listener;
+  };
+
+  Mutex reply_pending_mutex_;
+  MicroNovaSerialTransmission current_transmission_;
+
+  std::vector<MicroNovaSensorListener *> micronova_listeners_{};
+  MicroNovaSwitchListener *stove_switch_{nullptr};
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/number/__init__.py b/esphome/components/micronova/number/__init__.py
new file mode 100644
index 0000000000..7124bf50d0
--- /dev/null
+++ b/esphome/components/micronova/number/__init__.py
@@ -0,0 +1,110 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import number
+from esphome.const import (
+    DEVICE_CLASS_TEMPERATURE,
+    UNIT_CELSIUS,
+    CONF_STEP,
+)
+
+from .. import (
+    MicroNova,
+    MicroNovaFunctions,
+    CONF_MICRONOVA_ID,
+    CONF_MEMORY_LOCATION,
+    CONF_MEMORY_ADDRESS,
+    MICRONOVA_LISTENER_SCHEMA,
+    micronova_ns,
+)
+
+ICON_FLASH = "mdi:flash"
+
+CONF_THERMOSTAT_TEMPERATURE = "thermostat_temperature"
+CONF_POWER_LEVEL = "power_level"
+CONF_MEMORY_WRITE_LOCATION = "memory_write_location"
+
+MicroNovaNumber = micronova_ns.class_("MicroNovaNumber", number.Number, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+        cv.Optional(CONF_THERMOSTAT_TEMPERATURE): number.number_schema(
+            MicroNovaNumber,
+            unit_of_measurement=UNIT_CELSIUS,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+        )
+        .extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x20, default_memory_address=0x7D
+            )
+        )
+        .extend(
+            {
+                cv.Optional(
+                    CONF_MEMORY_WRITE_LOCATION, default=0xA0
+                ): cv.hex_int_range(),
+                cv.Optional(CONF_STEP, default=1.0): cv.float_range(min=0.1, max=10.0),
+            }
+        ),
+        cv.Optional(CONF_POWER_LEVEL): number.number_schema(
+            MicroNovaNumber,
+            icon=ICON_FLASH,
+        )
+        .extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x20, default_memory_address=0x7F
+            )
+        )
+        .extend(
+            {cv.Optional(CONF_MEMORY_WRITE_LOCATION, default=0xA0): cv.hex_int_range()}
+        ),
+    }
+)
+
+
+async def to_code(config):
+    mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
+
+    if thermostat_temperature_config := config.get(CONF_THERMOSTAT_TEMPERATURE):
+        numb = await number.new_number(
+            thermostat_temperature_config,
+            min_value=0,
+            max_value=40,
+            step=thermostat_temperature_config.get(CONF_STEP),
+        )
+        cg.add(numb.set_micronova_object(mv))
+        cg.add(mv.register_micronova_listener(numb))
+        cg.add(
+            numb.set_memory_location(
+                thermostat_temperature_config[CONF_MEMORY_LOCATION]
+            )
+        )
+        cg.add(
+            numb.set_memory_address(thermostat_temperature_config[CONF_MEMORY_ADDRESS])
+        )
+        cg.add(
+            numb.set_memory_write_location(
+                thermostat_temperature_config.get(CONF_MEMORY_WRITE_LOCATION)
+            )
+        )
+        cg.add(
+            numb.set_function(MicroNovaFunctions.STOVE_FUNCTION_THERMOSTAT_TEMPERATURE)
+        )
+
+    if power_level_config := config.get(CONF_POWER_LEVEL):
+        numb = await number.new_number(
+            power_level_config,
+            min_value=1,
+            max_value=5,
+            step=1,
+        )
+        cg.add(numb.set_micronova_object(mv))
+        cg.add(mv.register_micronova_listener(numb))
+        cg.add(numb.set_memory_location(power_level_config[CONF_MEMORY_LOCATION]))
+        cg.add(numb.set_memory_address(power_level_config[CONF_MEMORY_ADDRESS]))
+        cg.add(
+            numb.set_memory_write_location(
+                power_level_config.get(CONF_MEMORY_WRITE_LOCATION)
+            )
+        )
+        cg.add(numb.set_function(MicroNovaFunctions.STOVE_FUNCTION_POWER_LEVEL))
diff --git a/esphome/components/micronova/number/micronova_number.cpp b/esphome/components/micronova/number/micronova_number.cpp
new file mode 100644
index 0000000000..244eb7ee9f
--- /dev/null
+++ b/esphome/components/micronova/number/micronova_number.cpp
@@ -0,0 +1,45 @@
+#include "micronova_number.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNovaNumber::process_value_from_stove(int value_from_stove) {
+  float new_sensor_value = 0;
+
+  if (value_from_stove == -1) {
+    this->publish_state(NAN);
+    return;
+  }
+
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_THERMOSTAT_TEMPERATURE:
+      new_sensor_value = ((float) value_from_stove) * this->traits.get_step();
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_POWER_LEVEL:
+      new_sensor_value = (float) value_from_stove;
+      break;
+    default:
+      break;
+  }
+  this->publish_state(new_sensor_value);
+}
+
+void MicroNovaNumber::control(float value) {
+  uint8_t new_number = 0;
+
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_THERMOSTAT_TEMPERATURE:
+      new_number = (uint8_t) (value / this->traits.get_step());
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_POWER_LEVEL:
+      new_number = (uint8_t) value;
+      break;
+    default:
+      break;
+  }
+  this->micronova_->write_address(this->memory_write_location_, this->memory_address_, new_number);
+  this->micronova_->update();
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/number/micronova_number.h b/esphome/components/micronova/number/micronova_number.h
new file mode 100644
index 0000000000..49c6358255
--- /dev/null
+++ b/esphome/components/micronova/number/micronova_number.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "esphome/components/micronova/micronova.h"
+#include "esphome/components/number/number.h"
+
+namespace esphome {
+namespace micronova {
+
+class MicroNovaNumber : public number::Number, public MicroNovaSensorListener {
+ public:
+  MicroNovaNumber() {}
+  MicroNovaNumber(MicroNova *m) : MicroNovaSensorListener(m) {}
+  void dump_config() override { LOG_NUMBER("", "Micronova number", this); }
+  void control(float value) override;
+  void request_value_from_stove() override {
+    this->micronova_->request_address(this->memory_location_, this->memory_address_, this);
+  }
+  void process_value_from_stove(int value_from_stove) override;
+
+  void set_memory_write_location(uint8_t l) { this->memory_write_location_ = l; }
+  uint8_t get_memory_write_location() { return this->memory_write_location_; }
+
+ protected:
+  uint8_t memory_write_location_ = 0;
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/sensor/__init__.py b/esphome/components/micronova/sensor/__init__.py
new file mode 100644
index 0000000000..32e42f3888
--- /dev/null
+++ b/esphome/components/micronova/sensor/__init__.py
@@ -0,0 +1,172 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome.const import (
+    DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_PRESSURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_CELSIUS,
+    UNIT_REVOLUTIONS_PER_MINUTE,
+)
+
+from .. import (
+    MicroNova,
+    MicroNovaFunctions,
+    CONF_MICRONOVA_ID,
+    CONF_MEMORY_LOCATION,
+    CONF_MEMORY_ADDRESS,
+    MICRONOVA_LISTENER_SCHEMA,
+    micronova_ns,
+)
+
+UNIT_BAR = "bar"
+
+MicroNovaSensor = micronova_ns.class_("MicroNovaSensor", sensor.Sensor, cg.Component)
+
+CONF_ROOM_TEMPERATURE = "room_temperature"
+CONF_FUMES_TEMPERATURE = "fumes_temperature"
+CONF_STOVE_POWER = "stove_power"
+CONF_FAN_SPEED = "fan_speed"
+CONF_WATER_TEMPERATURE = "water_temperature"
+CONF_WATER_PRESSURE = "water_pressure"
+CONF_MEMORY_ADDRESS_SENSOR = "memory_address_sensor"
+CONF_FAN_RPM_OFFSET = "fan_rpm_offset"
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+        cv.Optional(CONF_ROOM_TEMPERATURE): sensor.sensor_schema(
+            MicroNovaSensor,
+            unit_of_measurement=UNIT_CELSIUS,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+            accuracy_decimals=1,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x01
+            )
+        ),
+        cv.Optional(CONF_FUMES_TEMPERATURE): sensor.sensor_schema(
+            MicroNovaSensor,
+            unit_of_measurement=UNIT_CELSIUS,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+            accuracy_decimals=1,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x5A
+            )
+        ),
+        cv.Optional(CONF_STOVE_POWER): sensor.sensor_schema(
+            MicroNovaSensor,
+            state_class=STATE_CLASS_MEASUREMENT,
+            accuracy_decimals=0,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x34
+            )
+        ),
+        cv.Optional(CONF_FAN_SPEED): sensor.sensor_schema(
+            MicroNovaSensor,
+            state_class=STATE_CLASS_MEASUREMENT,
+            unit_of_measurement=UNIT_REVOLUTIONS_PER_MINUTE,
+        )
+        .extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x37
+            )
+        )
+        .extend(
+            {cv.Optional(CONF_FAN_RPM_OFFSET, default=0): cv.int_range(min=0, max=255)}
+        ),
+        cv.Optional(CONF_WATER_TEMPERATURE): sensor.sensor_schema(
+            MicroNovaSensor,
+            unit_of_measurement=UNIT_CELSIUS,
+            device_class=DEVICE_CLASS_TEMPERATURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+            accuracy_decimals=1,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x3B
+            )
+        ),
+        cv.Optional(CONF_WATER_PRESSURE): sensor.sensor_schema(
+            MicroNovaSensor,
+            unit_of_measurement=UNIT_BAR,
+            device_class=DEVICE_CLASS_PRESSURE,
+            state_class=STATE_CLASS_MEASUREMENT,
+            accuracy_decimals=1,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x3C
+            )
+        ),
+        cv.Optional(CONF_MEMORY_ADDRESS_SENSOR): sensor.sensor_schema(
+            MicroNovaSensor,
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x00
+            )
+        ),
+    }
+)
+
+
+async def to_code(config):
+    mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
+
+    if room_temperature_config := config.get(CONF_ROOM_TEMPERATURE):
+        sens = await sensor.new_sensor(room_temperature_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(room_temperature_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(room_temperature_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_ROOM_TEMPERATURE))
+
+    if fumes_temperature_config := config.get(CONF_FUMES_TEMPERATURE):
+        sens = await sensor.new_sensor(fumes_temperature_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(fumes_temperature_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(fumes_temperature_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_FUMES_TEMPERATURE))
+
+    if stove_power_config := config.get(CONF_STOVE_POWER):
+        sens = await sensor.new_sensor(stove_power_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(stove_power_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(stove_power_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_STOVE_POWER))
+
+    if fan_speed_config := config.get(CONF_FAN_SPEED):
+        sens = await sensor.new_sensor(fan_speed_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(fan_speed_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(fan_speed_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_FAN_SPEED))
+        cg.add(sens.set_fan_speed_offset(fan_speed_config[CONF_FAN_RPM_OFFSET]))
+
+    if memory_address_sensor_config := config.get(CONF_MEMORY_ADDRESS_SENSOR):
+        sens = await sensor.new_sensor(memory_address_sensor_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(
+            sens.set_memory_location(memory_address_sensor_config[CONF_MEMORY_LOCATION])
+        )
+        cg.add(
+            sens.set_memory_address(memory_address_sensor_config[CONF_MEMORY_ADDRESS])
+        )
+        cg.add(
+            sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_MEMORY_ADDRESS_SENSOR)
+        )
+
+    if water_temperature_config := config.get(CONF_WATER_TEMPERATURE):
+        sens = await sensor.new_sensor(water_temperature_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(water_temperature_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(water_temperature_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_WATER_TEMPERATURE))
+
+    if water_pressure_config := config.get(CONF_WATER_PRESSURE):
+        sens = await sensor.new_sensor(water_pressure_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(water_pressure_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(water_pressure_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_WATER_PRESSURE))
diff --git a/esphome/components/micronova/sensor/micronova_sensor.cpp b/esphome/components/micronova/sensor/micronova_sensor.cpp
new file mode 100644
index 0000000000..3f0c0feaf8
--- /dev/null
+++ b/esphome/components/micronova/sensor/micronova_sensor.cpp
@@ -0,0 +1,35 @@
+#include "micronova_sensor.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNovaSensor::process_value_from_stove(int value_from_stove) {
+  if (value_from_stove == -1) {
+    this->publish_state(NAN);
+    return;
+  }
+
+  float new_sensor_value = (float) value_from_stove;
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_ROOM_TEMPERATURE:
+      new_sensor_value = new_sensor_value / 2;
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_THERMOSTAT_TEMPERATURE:
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_FAN_SPEED:
+      new_sensor_value = new_sensor_value == 0 ? 0 : (new_sensor_value * 10) + this->fan_speed_offset_;
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_WATER_TEMPERATURE:
+      new_sensor_value = new_sensor_value / 2;
+      break;
+    case MicroNovaFunctions::STOVE_FUNCTION_WATER_PRESSURE:
+      new_sensor_value = new_sensor_value / 10;
+      break;
+    default:
+      break;
+  }
+  this->publish_state(new_sensor_value);
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/sensor/micronova_sensor.h b/esphome/components/micronova/sensor/micronova_sensor.h
new file mode 100644
index 0000000000..9d5ae96b87
--- /dev/null
+++ b/esphome/components/micronova/sensor/micronova_sensor.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/components/micronova/micronova.h"
+#include "esphome/components/sensor/sensor.h"
+
+namespace esphome {
+namespace micronova {
+
+class MicroNovaSensor : public sensor::Sensor, public MicroNovaSensorListener {
+ public:
+  MicroNovaSensor(MicroNova *m) : MicroNovaSensorListener(m) {}
+  void dump_config() override { LOG_SENSOR("", "Micronova sensor", this); }
+
+  void request_value_from_stove() override {
+    this->micronova_->request_address(this->memory_location_, this->memory_address_, this);
+  }
+  void process_value_from_stove(int value_from_stove) override;
+
+  void set_fan_speed_offset(uint8_t f) { this->fan_speed_offset_ = f; }
+  uint8_t get_set_fan_speed_offset() { return this->fan_speed_offset_; }
+
+ protected:
+  int fan_speed_offset_ = 0;
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/switch/__init__.py b/esphome/components/micronova/switch/__init__.py
new file mode 100644
index 0000000000..9846d46cc6
--- /dev/null
+++ b/esphome/components/micronova/switch/__init__.py
@@ -0,0 +1,56 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import switch
+from esphome.const import (
+    ICON_POWER,
+)
+
+from .. import (
+    MicroNova,
+    MicroNovaFunctions,
+    CONF_MICRONOVA_ID,
+    CONF_MEMORY_LOCATION,
+    CONF_MEMORY_ADDRESS,
+    MICRONOVA_LISTENER_SCHEMA,
+    micronova_ns,
+)
+
+CONF_STOVE = "stove"
+CONF_MEMORY_DATA_ON = "memory_data_on"
+CONF_MEMORY_DATA_OFF = "memory_data_off"
+
+MicroNovaSwitch = micronova_ns.class_("MicroNovaSwitch", switch.Switch, cg.Component)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+        cv.Optional(CONF_STOVE): switch.switch_schema(
+            MicroNovaSwitch,
+            icon=ICON_POWER,
+        )
+        .extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x80, default_memory_address=0x21
+            )
+        )
+        .extend(
+            {
+                cv.Optional(CONF_MEMORY_DATA_OFF, default=0x06): cv.hex_int_range(),
+                cv.Optional(CONF_MEMORY_DATA_ON, default=0x01): cv.hex_int_range(),
+            }
+        ),
+    }
+)
+
+
+async def to_code(config):
+    mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
+
+    if stove_config := config.get(CONF_STOVE):
+        sw = await switch.new_switch(stove_config, mv)
+        cg.add(mv.set_stove(sw))
+        cg.add(sw.set_memory_location(stove_config[CONF_MEMORY_LOCATION]))
+        cg.add(sw.set_memory_address(stove_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sw.set_memory_data_on(stove_config[CONF_MEMORY_DATA_ON]))
+        cg.add(sw.set_memory_data_off(stove_config[CONF_MEMORY_DATA_OFF]))
+        cg.add(sw.set_function(MicroNovaFunctions.STOVE_FUNCTION_SWITCH))
diff --git a/esphome/components/micronova/switch/micronova_switch.cpp b/esphome/components/micronova/switch/micronova_switch.cpp
new file mode 100644
index 0000000000..dcc96102db
--- /dev/null
+++ b/esphome/components/micronova/switch/micronova_switch.cpp
@@ -0,0 +1,33 @@
+#include "micronova_switch.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNovaSwitch::write_state(bool state) {
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_SWITCH:
+      if (state) {
+        // Only send power-on when current state is Off
+        if (this->micronova_->get_current_stove_state() == 0) {
+          this->micronova_->write_address(this->memory_location_, this->memory_address_, this->memory_data_on_);
+          this->publish_state(true);
+        } else
+          ESP_LOGW(TAG, "Unable to turn stove on, invalid state: %d", micronova_->get_current_stove_state());
+      } else {
+        // don't send power-off when status is Off or Final cleaning
+        if (this->micronova_->get_current_stove_state() != 0 && micronova_->get_current_stove_state() != 6) {
+          this->micronova_->write_address(this->memory_location_, this->memory_address_, this->memory_data_off_);
+          this->publish_state(false);
+        } else
+          ESP_LOGW(TAG, "Unable to turn stove off, invalid state: %d", micronova_->get_current_stove_state());
+      }
+      this->micronova_->update();
+      break;
+
+    default:
+      break;
+  }
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/switch/micronova_switch.h b/esphome/components/micronova/switch/micronova_switch.h
new file mode 100644
index 0000000000..b0ca33b497
--- /dev/null
+++ b/esphome/components/micronova/switch/micronova_switch.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "esphome/components/micronova/micronova.h"
+#include "esphome/core/component.h"
+#include "esphome/components/switch/switch.h"
+
+namespace esphome {
+namespace micronova {
+
+class MicroNovaSwitch : public Component, public switch_::Switch, public MicroNovaSwitchListener {
+ public:
+  MicroNovaSwitch(MicroNova *m) : MicroNovaSwitchListener(m) {}
+  void dump_config() override { LOG_SWITCH("", "Micronova switch", this); }
+
+  void set_stove_state(bool v) override { this->publish_state(v); }
+  bool get_stove_state() override { return this->state; }
+
+  void set_memory_data_on(uint8_t f) { this->memory_data_on_ = f; }
+  uint8_t get_memory_data_on() { return this->memory_data_on_; }
+
+  void set_memory_data_off(uint8_t f) { this->memory_data_off_ = f; }
+  uint8_t get_memory_data_off() { return this->memory_data_off_; }
+
+ protected:
+  void write_state(bool state) override;
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/text_sensor/__init__.py b/esphome/components/micronova/text_sensor/__init__.py
new file mode 100644
index 0000000000..dc27c4f32c
--- /dev/null
+++ b/esphome/components/micronova/text_sensor/__init__.py
@@ -0,0 +1,43 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import text_sensor
+
+from .. import (
+    MicroNova,
+    MicroNovaFunctions,
+    CONF_MICRONOVA_ID,
+    CONF_MEMORY_LOCATION,
+    CONF_MEMORY_ADDRESS,
+    MICRONOVA_LISTENER_SCHEMA,
+    micronova_ns,
+)
+
+CONF_STOVE_STATE = "stove_state"
+
+MicroNovaTextSensor = micronova_ns.class_(
+    "MicroNovaTextSensor", text_sensor.TextSensor, cg.Component
+)
+
+CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.GenerateID(CONF_MICRONOVA_ID): cv.use_id(MicroNova),
+        cv.Optional(CONF_STOVE_STATE): text_sensor.text_sensor_schema(
+            MicroNovaTextSensor
+        ).extend(
+            MICRONOVA_LISTENER_SCHEMA(
+                default_memory_location=0x00, default_memory_address=0x21
+            )
+        ),
+    }
+)
+
+
+async def to_code(config):
+    mv = await cg.get_variable(config[CONF_MICRONOVA_ID])
+
+    if stove_state_config := config.get(CONF_STOVE_STATE):
+        sens = await text_sensor.new_text_sensor(stove_state_config, mv)
+        cg.add(mv.register_micronova_listener(sens))
+        cg.add(sens.set_memory_location(stove_state_config[CONF_MEMORY_LOCATION]))
+        cg.add(sens.set_memory_address(stove_state_config[CONF_MEMORY_ADDRESS]))
+        cg.add(sens.set_function(MicroNovaFunctions.STOVE_FUNCTION_STOVE_STATE))
diff --git a/esphome/components/micronova/text_sensor/micronova_text_sensor.cpp b/esphome/components/micronova/text_sensor/micronova_text_sensor.cpp
new file mode 100644
index 0000000000..03b192ffd1
--- /dev/null
+++ b/esphome/components/micronova/text_sensor/micronova_text_sensor.cpp
@@ -0,0 +1,31 @@
+#include "micronova_text_sensor.h"
+
+namespace esphome {
+namespace micronova {
+
+void MicroNovaTextSensor::process_value_from_stove(int value_from_stove) {
+  if (value_from_stove == -1) {
+    this->publish_state("unknown");
+    return;
+  }
+
+  switch (this->get_function()) {
+    case MicroNovaFunctions::STOVE_FUNCTION_STOVE_STATE:
+      this->micronova_->set_current_stove_state(value_from_stove);
+      this->publish_state(STOVE_STATES[value_from_stove]);
+      // set the stove switch to on for any value but 0
+      if (value_from_stove != 0 && this->micronova_->get_stove_switch() != nullptr &&
+          !this->micronova_->get_stove_switch()->get_stove_state()) {
+        this->micronova_->get_stove_switch()->set_stove_state(true);
+      } else if (value_from_stove == 0 && this->micronova_->get_stove_switch() != nullptr &&
+                 this->micronova_->get_stove_switch()->get_stove_state()) {
+        this->micronova_->get_stove_switch()->set_stove_state(false);
+      }
+      break;
+    default:
+      break;
+  }
+}
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/esphome/components/micronova/text_sensor/micronova_text_sensor.h b/esphome/components/micronova/text_sensor/micronova_text_sensor.h
new file mode 100644
index 0000000000..b4e5de9bb3
--- /dev/null
+++ b/esphome/components/micronova/text_sensor/micronova_text_sensor.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "esphome/components/micronova/micronova.h"
+#include "esphome/components/text_sensor/text_sensor.h"
+
+namespace esphome {
+namespace micronova {
+
+class MicroNovaTextSensor : public text_sensor::TextSensor, public MicroNovaSensorListener {
+ public:
+  MicroNovaTextSensor(MicroNova *m) : MicroNovaSensorListener(m) {}
+  void dump_config() override { LOG_TEXT_SENSOR("", "Micronova text sensor", this); }
+  void request_value_from_stove() override {
+    this->micronova_->request_address(this->memory_location_, this->memory_address_, this);
+  }
+  void process_value_from_stove(int value_from_stove) override;
+};
+
+}  // namespace micronova
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index da6227e235..7bd6dcb41d 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -342,6 +342,10 @@ mcp23s17:
     cs_pin: GPIO12
     deviceaddress: 1
 
+micronova:
+  enable_rx_pin: 4
+  uart_id: uart_0
+
 dfrobot_sen0395:
   - id: mmwave
     uart_id: dfrobot_mmwave_uart
@@ -1518,6 +1522,24 @@ sensor:
     field_strength_z:
       name: "Magnet Z"
       id: magnet_z
+  - platform: micronova
+    room_temperature:
+      name: Room Temperature
+    fumes_temperature:
+      name: Fumes Temperature
+    water_temperature:
+      name: Water temperature
+    water_pressure:
+      name: Water pressure
+    stove_power:
+      name: Stove Power
+    fan_speed:
+      fan_rpm_offset: 240
+      name: Fan RPM
+    memory_address_sensor:
+      memory_location: 0x20
+      memory_address: 0x7d
+      name: Adres sensor
 
 esp32_touch:
   setup_mode: false
@@ -2705,6 +2727,9 @@ switch:
       name: "control ld2410 engineering mode"
     bluetooth:
       name: "control ld2410 bluetooth"
+  - platform: micronova
+    stove:
+      name: Stove on/off
 
 fan:
   - platform: binary
@@ -3489,6 +3514,12 @@ number:
         name: g8 move threshold
       still_threshold:
         name: g8 still threshold
+  - platform: micronova
+    thermostat_temperature:
+      name: Micronova Thermostaat
+      step: 1
+    power_level:
+      name: Micronova Power level
 
 select:
   - platform: template
@@ -3619,6 +3650,12 @@ button:
     uart_id: uart_0
     name: UART button
     data: "Pressed\r\n"
+  - platform: micronova
+    custom_button:
+      name: Custom Micronova Button
+      memory_location: 0xA0
+      memory_address: 0x7D
+      memory_data: 0x0F
 
 ld2410:
   id: my_ld2410
@@ -3727,3 +3764,4 @@ alarm_control_panel:
       then:
         - lambda: !lambda |-
             ESP_LOGD("TEST", "State change %s", alarm_control_panel_state_to_string(id(alarmcontrolpanel1)->get_state()));
+

From 4ef2e284969cffe756727e85c961ce247b7f9ca5 Mon Sep 17 00:00:00 2001
From: Patrick ZAJDA <patrick@zajda.fr>
Date: Sun, 5 Nov 2023 21:27:14 +0100
Subject: [PATCH 108/131] Add basic shell autocompletion using argcomplete
 (#5618)

---
 esphome/__main__.py | 4 ++++
 requirements.txt    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/esphome/__main__.py b/esphome/__main__.py
index cf540f58ba..a253fc78a0 100644
--- a/esphome/__main__.py
+++ b/esphome/__main__.py
@@ -1,3 +1,4 @@
+# PYTHON_ARGCOMPLETE_OK
 import argparse
 import functools
 import logging
@@ -7,6 +8,8 @@ import sys
 import time
 from datetime import datetime
 
+import argcomplete
+
 from esphome import const, writer, yaml_util
 import esphome.codegen as cg
 from esphome.config import iter_components, read_config, strip_default_ids
@@ -966,6 +969,7 @@ def parse_args(argv):
     # Finally, run the new-style parser again with the possibly swapped arguments,
     # and let it error out if the command is unparsable.
     parser.set_defaults(deprecated_argv_suggestion=deprecated_argv_suggestion)
+    argcomplete.autocomplete(parser)
     return parser.parse_args(arguments)
 
 
diff --git a/requirements.txt b/requirements.txt
index b9b6708ff2..5c57f3e933 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,3 +19,6 @@ kconfiglib==13.7.1
 
 # esp-idf >= 5.0 requires this
 pyparsing >= 3.0
+
+# For autocompletion
+argcomplete>=2.0.0

From 4ca9aefc43c189583d0f99d2023a7ea9e11fc36b Mon Sep 17 00:00:00 2001
From: Pavlo Dudnytskyi <paveldudn@gmail.com>
Date: Sun, 5 Nov 2023 21:28:50 +0100
Subject: [PATCH 109/131] Fixed int variables for user defined service in case
 of ESP32-C3 (#5675)

---
 esphome/components/api/user_services.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/esphome/components/api/user_services.cpp b/esphome/components/api/user_services.cpp
index 49618f5467..7e73722a92 100644
--- a/esphome/components/api/user_services.cpp
+++ b/esphome/components/api/user_services.cpp
@@ -5,7 +5,7 @@ namespace esphome {
 namespace api {
 
 template<> bool get_execute_arg_value<bool>(const ExecuteServiceArgument &arg) { return arg.bool_; }
-template<> int get_execute_arg_value<int>(const ExecuteServiceArgument &arg) {
+template<> int32_t get_execute_arg_value<int32_t>(const ExecuteServiceArgument &arg) {
   if (arg.legacy_int != 0)
     return arg.legacy_int;
   return arg.int_;
@@ -26,11 +26,13 @@ template<> std::vector<std::string> get_execute_arg_value<std::vector<std::strin
 }
 
 template<> enums::ServiceArgType to_service_arg_type<bool>() { return enums::SERVICE_ARG_TYPE_BOOL; }
-template<> enums::ServiceArgType to_service_arg_type<int>() { return enums::SERVICE_ARG_TYPE_INT; }
+template<> enums::ServiceArgType to_service_arg_type<int32_t>() { return enums::SERVICE_ARG_TYPE_INT; }
 template<> enums::ServiceArgType to_service_arg_type<float>() { return enums::SERVICE_ARG_TYPE_FLOAT; }
 template<> enums::ServiceArgType to_service_arg_type<std::string>() { return enums::SERVICE_ARG_TYPE_STRING; }
 template<> enums::ServiceArgType to_service_arg_type<std::vector<bool>>() { return enums::SERVICE_ARG_TYPE_BOOL_ARRAY; }
-template<> enums::ServiceArgType to_service_arg_type<std::vector<int>>() { return enums::SERVICE_ARG_TYPE_INT_ARRAY; }
+template<> enums::ServiceArgType to_service_arg_type<std::vector<int32_t>>() {
+  return enums::SERVICE_ARG_TYPE_INT_ARRAY;
+}
 template<> enums::ServiceArgType to_service_arg_type<std::vector<float>>() {
   return enums::SERVICE_ARG_TYPE_FLOAT_ARRAY;
 }

From 3ee85d7516747d946b31649de0234104f0594244 Mon Sep 17 00:00:00 2001
From: micw <michael@wyraz.de>
Date: Sun, 5 Nov 2023 22:27:11 +0100
Subject: [PATCH 110/131] Add callback for raw sml messages (#5668)

---
 esphome/components/sml/__init__.py  | 32 ++++++++++++++++++++++++++++-
 esphome/components/sml/automation.h | 19 +++++++++++++++++
 esphome/components/sml/constants.h  |  4 +++-
 esphome/components/sml/sml.cpp      | 20 ++++++++++++++----
 esphome/components/sml/sml.h        |  4 ++++
 5 files changed, 73 insertions(+), 6 deletions(-)
 create mode 100644 esphome/components/sml/automation.h

diff --git a/esphome/components/sml/__init__.py b/esphome/components/sml/__init__.py
index f3b6dd95ef..8bcfb69a45 100644
--- a/esphome/components/sml/__init__.py
+++ b/esphome/components/sml/__init__.py
@@ -1,9 +1,10 @@
 import re
 
+from esphome import automation
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome.components import uart
-from esphome.const import CONF_ID
+from esphome.const import CONF_ID, CONF_TRIGGER_ID
 
 CODEOWNERS = ["@alengwenus"]
 
@@ -16,10 +17,26 @@ MULTI_CONF = True
 CONF_SML_ID = "sml_id"
 CONF_OBIS_CODE = "obis_code"
 CONF_SERVER_ID = "server_id"
+CONF_ON_DATA = "on_data"
+
+sml_ns = cg.esphome_ns.namespace("sml")
+
+DataTrigger = sml_ns.class_(
+    "DataTrigger",
+    automation.Trigger.template(
+        cg.std_vector.template(cg.uint8).operator("ref"), cg.bool_
+    ),
+)
+
 
 CONFIG_SCHEMA = cv.Schema(
     {
         cv.GenerateID(): cv.declare_id(Sml),
+        cv.Optional(CONF_ON_DATA): automation.validate_automation(
+            {
+                cv.GenerateID(CONF_TRIGGER_ID): cv.declare_id(DataTrigger),
+            }
+        ),
     }
 ).extend(uart.UART_DEVICE_SCHEMA)
 
@@ -28,6 +45,19 @@ async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
     await uart.register_uart_device(var, config)
+    for conf in config.get(CONF_ON_DATA, []):
+        trigger = cg.new_Pvariable(conf[CONF_TRIGGER_ID], var)
+        await automation.build_automation(
+            trigger,
+            [
+                (
+                    cg.std_vector.template(cg.uint8).operator("ref").operator("const"),
+                    "bytes",
+                ),
+                (cg.bool_, "valid"),
+            ],
+            conf,
+        )
 
 
 def obis_code(value):
diff --git a/esphome/components/sml/automation.h b/esphome/components/sml/automation.h
new file mode 100644
index 0000000000..d51063065d
--- /dev/null
+++ b/esphome/components/sml/automation.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "esphome/core/automation.h"
+#include "sml.h"
+
+#include <vector>
+
+namespace esphome {
+namespace sml {
+
+class DataTrigger : public Trigger<const std::vector<uint8_t> &, bool> {
+ public:
+  explicit DataTrigger(Sml *sml) {
+    sml->add_on_data_callback([this](const std::vector<uint8_t> &data, bool valid) { this->trigger(data, valid); });
+  }
+};
+
+}  // namespace sml
+}  // namespace esphome
diff --git a/esphome/components/sml/constants.h b/esphome/components/sml/constants.h
index 08a124ccad..d6761d4bb7 100644
--- a/esphome/components/sml/constants.h
+++ b/esphome/components/sml/constants.h
@@ -18,8 +18,10 @@ enum SmlType : uint8_t {
 enum SmlMessageType : uint16_t { SML_PUBLIC_OPEN_RES = 0x0101, SML_GET_LIST_RES = 0x701 };
 
 // masks with two-bit mapping 0x1b -> 0b01; 0x01 -> 0b10; 0x1a -> 0b11
-const uint16_t START_MASK = 0x55aa;  // 0x1b 1b 1b 1b 1b 01 01 01 01
+const uint16_t START_MASK = 0x55aa;  // 0x1b 1b 1b 1b 01 01 01 01
 const uint16_t END_MASK = 0x0157;    // 0x1b 1b 1b 1b 1a
 
+const std::vector<uint8_t> START_SEQ = {0x1b, 0x1b, 0x1b, 0x1b, 0x01, 0x01, 0x01, 0x01};
+
 }  // namespace sml
 }  // namespace esphome
diff --git a/esphome/components/sml/sml.cpp b/esphome/components/sml/sml.cpp
index 921623d4fd..bac13be923 100644
--- a/esphome/components/sml/sml.cpp
+++ b/esphome/components/sml/sml.cpp
@@ -35,16 +35,24 @@ void Sml::loop() {
       case START_BYTES_DETECTED: {
         this->record_ = true;
         this->sml_data_.clear();
+        // add start sequence (for callbacks)
+        this->sml_data_.insert(this->sml_data_.begin(), START_SEQ.begin(), START_SEQ.end());
         break;
       };
       case END_BYTES_DETECTED: {
         if (this->record_) {
           this->record_ = false;
 
-          if (!check_sml_data(this->sml_data_))
+          bool valid = check_sml_data(this->sml_data_);
+
+          // call callbacks
+          this->data_callbacks_.call(this->sml_data_, valid);
+
+          if (!valid)
             break;
 
-          // remove footer bytes
+          // remove start/end sequence
+          this->sml_data_.erase(this->sml_data_.begin(), this->sml_data_.begin() + START_SEQ.size());
           this->sml_data_.resize(this->sml_data_.size() - 8);
           this->process_sml_file_(this->sml_data_);
         }
@@ -54,6 +62,10 @@ void Sml::loop() {
   }
 }
 
+void Sml::add_on_data_callback(std::function<void(std::vector<uint8_t>, bool)> &&callback) {
+  this->data_callbacks_.add(std::move(callback));
+}
+
 void Sml::process_sml_file_(const bytes &sml_data) {
   SmlFile sml_file = SmlFile(sml_data);
   std::vector<ObisInfo> obis_info = sml_file.get_obis_info();
@@ -100,14 +112,14 @@ bool check_sml_data(const bytes &buffer) {
   }
 
   uint16_t crc_received = (buffer.at(buffer.size() - 2) << 8) | buffer.at(buffer.size() - 1);
-  uint16_t crc_calculated = crc16(buffer.data(), buffer.size() - 2, 0x6e23, 0x8408, true, true);
+  uint16_t crc_calculated = crc16(buffer.data() + 8, buffer.size() - 10, 0x6e23, 0x8408, true, true);
   crc_calculated = (crc_calculated >> 8) | (crc_calculated << 8);
   if (crc_received == crc_calculated) {
     ESP_LOGV(TAG, "Checksum verification successful with CRC16/X25.");
     return true;
   }
 
-  crc_calculated = crc16(buffer.data(), buffer.size() - 2, 0xed50, 0x8408);
+  crc_calculated = crc16(buffer.data() + 8, buffer.size() - 10, 0xed50, 0x8408);
   if (crc_received == crc_calculated) {
     ESP_LOGV(TAG, "Checksum verification successful with CRC16/KERMIT.");
     return true;
diff --git a/esphome/components/sml/sml.h b/esphome/components/sml/sml.h
index ebc8b17d7f..b0c932ca95 100644
--- a/esphome/components/sml/sml.h
+++ b/esphome/components/sml/sml.h
@@ -3,6 +3,7 @@
 #include <string>
 #include <vector>
 #include "esphome/core/component.h"
+#include "esphome/core/helpers.h"
 #include "esphome/components/uart/uart.h"
 #include "sml_parser.h"
 
@@ -23,6 +24,7 @@ class Sml : public Component, public uart::UARTDevice {
   void loop() override;
   void dump_config() override;
   std::vector<SmlListener *> sml_listeners_{};
+  void add_on_data_callback(std::function<void(std::vector<uint8_t>, bool)> &&callback);
 
  protected:
   void process_sml_file_(const bytes &sml_data);
@@ -35,6 +37,8 @@ class Sml : public Component, public uart::UARTDevice {
   bool record_ = false;
   uint16_t incoming_mask_ = 0;
   bytes sml_data_;
+
+  CallbackManager<void(const std::vector<uint8_t> &, bool)> data_callbacks_{};
 };
 
 bool check_sml_data(const bytes &buffer);

From e0cee472c3bfc29c87b6c0e52aa1f428c3c3c8ff Mon Sep 17 00:00:00 2001
From: DAVe3283 <DAVe3283+GitHub@gmail.com>
Date: Sun, 5 Nov 2023 16:13:01 -0700
Subject: [PATCH 111/131] Fix compile with latest esp-idf on esp32c6 (#5677)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/aht10/aht10.cpp            |  5 ++-
 esphome/components/atm90e32/atm90e32.cpp      | 11 +++--
 esphome/components/bl0939/bl0939.cpp          |  8 ++--
 esphome/components/bl0940/bl0940.cpp          |  7 ++--
 esphome/components/bl0942/bl0942.cpp          |  5 ++-
 esphome/components/bmp3xx/bmp3xx.cpp          |  6 ++-
 esphome/components/canbus/canbus.cpp          |  4 +-
 esphome/components/cd74hc4067/cd74hc4067.cpp  |  3 +-
 esphome/components/cse7761/cse7761.cpp        |  2 +-
 esphome/components/cse7766/cse7766.cpp        |  6 ++-
 .../ethernet/ethernet_component.cpp           |  3 +-
 .../fingerprint_grow/fingerprint_grow.cpp     |  3 +-
 esphome/components/nfc/ndef_message.cpp       |  3 +-
 esphome/components/pid/pid_autotuner.cpp      |  7 ++--
 esphome/components/pzem004t/pzem004t.cpp      |  3 +-
 .../remote_base/drayton_protocol.cpp          | 16 +++++---
 .../components/remote_base/remote_base.cpp    | 10 ++---
 .../remote_receiver/remote_receiver_esp32.cpp | 12 ++++--
 esphome/components/rf_bridge/rf_bridge.cpp    | 11 +++--
 esphome/components/servo/servo.cpp            |  5 ++-
 esphome/components/sgp4x/sgp4x.cpp            |  2 +-
 esphome/components/spi/spi_arduino.cpp        |  2 +-
 esphome/components/sprinkler/sprinkler.cpp    | 40 ++++++++++---------
 .../status_led/light/status_led_light.cpp     |  3 +-
 .../thermostat/thermostat_climate.cpp         | 27 ++++++++-----
 .../components/tof10120/tof10120_sensor.cpp   |  3 +-
 .../components/tuya/sensor/tuya_sensor.cpp    |  3 +-
 esphome/components/vbus/vbus.cpp              |  5 ++-
 esphome/components/wireguard/wireguard.cpp    |  5 ++-
 29 files changed, 132 insertions(+), 88 deletions(-)

diff --git a/esphome/components/aht10/aht10.cpp b/esphome/components/aht10/aht10.cpp
index ad1a68498b..1ca06b458a 100644
--- a/esphome/components/aht10/aht10.cpp
+++ b/esphome/components/aht10/aht10.cpp
@@ -15,6 +15,7 @@
 #include "aht10.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace aht10 {
@@ -72,7 +73,7 @@ void AHT10Component::update() {
     delay_ms = AHT10_HUMIDITY_DELAY;
   bool success = false;
   for (int i = 0; i < AHT10_ATTEMPTS; ++i) {
-    ESP_LOGVV(TAG, "Attempt %d at %6u", i, millis());
+    ESP_LOGVV(TAG, "Attempt %d at %6" PRIu32, i, millis());
     delay(delay_ms);
     if (this->read(data, 6) != i2c::ERROR_OK) {
       ESP_LOGD(TAG, "Communication with AHT10 failed, waiting...");
@@ -96,7 +97,7 @@ void AHT10Component::update() {
       }
     } else {
       // data is valid, we can break the loop
-      ESP_LOGVV(TAG, "Answer at %6u", millis());
+      ESP_LOGVV(TAG, "Answer at %6" PRIu32, millis());
       success = true;
       break;
     }
diff --git a/esphome/components/atm90e32/atm90e32.cpp b/esphome/components/atm90e32/atm90e32.cpp
index e4b8448da6..e38fd3866a 100644
--- a/esphome/components/atm90e32/atm90e32.cpp
+++ b/esphome/components/atm90e32/atm90e32.cpp
@@ -1,6 +1,7 @@
 #include "atm90e32.h"
 #include "atm90e32_reg.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace atm90e32 {
@@ -173,7 +174,7 @@ uint16_t ATM90E32Component::read16_(uint16_t a_register) {
   this->disable();
 
   output = (uint16_t(data[0] & 0xFF) << 8) | (data[1] & 0xFF);
-  ESP_LOGVV(TAG, "read16_ 0x%04X output 0x%04X", a_register, output);
+  ESP_LOGVV(TAG, "read16_ 0x%04" PRIX16 " output 0x%04" PRIX16, a_register, output);
   return output;
 }
 
@@ -182,8 +183,10 @@ int ATM90E32Component::read32_(uint16_t addr_h, uint16_t addr_l) {
   uint16_t val_l = this->read16_(addr_l);
   int32_t val = (val_h << 16) | val_l;
 
-  ESP_LOGVV(TAG, "read32_ addr_h 0x%04X val_h 0x%04X addr_l 0x%04X val_l 0x%04X = %d", addr_h, val_h, addr_l, val_l,
-            val);
+  ESP_LOGVV(TAG,
+            "read32_ addr_h 0x%04" PRIX16 " val_h 0x%04" PRIX16 " addr_l 0x%04" PRIX16 " val_l 0x%04" PRIX16
+            " = %" PRId32,
+            addr_h, val_h, addr_l, val_l, val);
 
   return val;
 }
@@ -192,7 +195,7 @@ void ATM90E32Component::write16_(uint16_t a_register, uint16_t val) {
   uint8_t addrh = (a_register >> 8) & 0x03;
   uint8_t addrl = (a_register & 0xFF);
 
-  ESP_LOGVV(TAG, "write16_ 0x%04X val 0x%04X", a_register, val);
+  ESP_LOGVV(TAG, "write16_ 0x%04" PRIX16 " val 0x%04" PRIX16, a_register, val);
   this->enable();
   delayMicroseconds(10);
   this->write_byte(addrh);
diff --git a/esphome/components/bl0939/bl0939.cpp b/esphome/components/bl0939/bl0939.cpp
index 0575507c46..7428e48740 100644
--- a/esphome/components/bl0939/bl0939.cpp
+++ b/esphome/components/bl0939/bl0939.cpp
@@ -1,5 +1,6 @@
 #include "bl0939.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace bl0939 {
@@ -80,7 +81,7 @@ void BL0939::setup() {
 void BL0939::received_package_(const DataPacket *data) const {
   // Bad header
   if (data->frame_header != BL0939_PACKET_HEADER) {
-    ESP_LOGI("bl0939", "Invalid data. Header mismatch: %d", data->frame_header);
+    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
     return;
   }
 
@@ -120,8 +121,9 @@ void BL0939::received_package_(const DataPacket *data) const {
     energy_sensor_sum_->publish_state(total_energy_consumption);
   }
 
-  ESP_LOGV("bl0939", "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %d, CntB %d, ∫P1 %fkWh, ∫P2 %fkWh", v_rms,
-           ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
+  ESP_LOGV(TAG,
+           "BL0939: U %fV, I1 %fA, I2 %fA, P1 %fW, P2 %fW, CntA %" PRId32 ", CntB %" PRId32 ", ∫P1 %fkWh, ∫P2 %fkWh",
+           v_rms, ia_rms, ib_rms, a_watt, b_watt, cfa_cnt, cfb_cnt, a_energy_consumption, b_energy_consumption);
 }
 
 void BL0939::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
diff --git a/esphome/components/bl0940/bl0940.cpp b/esphome/components/bl0940/bl0940.cpp
index ed193b23f3..24990d5482 100644
--- a/esphome/components/bl0940/bl0940.cpp
+++ b/esphome/components/bl0940/bl0940.cpp
@@ -1,5 +1,6 @@
 #include "bl0940.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace bl0940 {
@@ -77,7 +78,7 @@ float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
   float converted_temp = ((float) 170 / 448) * (tb / 2 - 32) - 45;
   if (sensor != nullptr) {
     if (sensor->has_state() && std::abs(converted_temp - sensor->get_state()) > max_temperature_diff_) {
-      ESP_LOGD("bl0940", "Invalid temperature change. Sensor: '%s', Old temperature: %f, New temperature: %f",
+      ESP_LOGD(TAG, "Invalid temperature change. Sensor: '%s', Old temperature: %f, New temperature: %f",
                sensor->get_name().c_str(), sensor->get_state(), converted_temp);
       return 0.0f;
     }
@@ -89,7 +90,7 @@ float BL0940::update_temp_(sensor::Sensor *sensor, ube16_t temperature) const {
 void BL0940::received_package_(const DataPacket *data) const {
   // Bad header
   if (data->frame_header != BL0940_PACKET_HEADER) {
-    ESP_LOGI("bl0940", "Invalid data. Header mismatch: %d", data->frame_header);
+    ESP_LOGI(TAG, "Invalid data. Header mismatch: %d", data->frame_header);
     return;
   }
 
@@ -115,7 +116,7 @@ void BL0940::received_package_(const DataPacket *data) const {
     energy_sensor_->publish_state(total_energy_consumption);
   }
 
-  ESP_LOGV("bl0940", "BL0940: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, T1 %f°C, T2 %f°C", v_rms, i_rms, watt, cf_cnt,
+  ESP_LOGV(TAG, "BL0940: U %fV, I %fA, P %fW, Cnt %" PRId32 ", ∫P %fkWh, T1 %f°C, T2 %f°C", v_rms, i_rms, watt, cf_cnt,
            total_energy_consumption, tps1, tps2);
 }
 
diff --git a/esphome/components/bl0942/bl0942.cpp b/esphome/components/bl0942/bl0942.cpp
index e6d18a82a7..38b1c89036 100644
--- a/esphome/components/bl0942/bl0942.cpp
+++ b/esphome/components/bl0942/bl0942.cpp
@@ -1,5 +1,6 @@
 #include "bl0942.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace bl0942 {
@@ -104,8 +105,8 @@ void BL0942::received_package_(DataPacket *data) {
     frequency_sensor_->publish_state(frequency);
   }
 
-  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %d, ∫P %fkWh, frequency %f°Hz, status 0x%08X", v_rms, i_rms, watt,
-           cf_cnt, total_energy_consumption, frequency, data->status);
+  ESP_LOGV(TAG, "BL0942: U %fV, I %fA, P %fW, Cnt %" PRId32 ", ∫P %fkWh, frequency %fHz, status 0x%08X", v_rms, i_rms,
+           watt, cf_cnt, total_energy_consumption, frequency, data->status);
 }
 
 void BL0942::dump_config() {  // NOLINT(readability-function-cognitive-complexity)
diff --git a/esphome/components/bmp3xx/bmp3xx.cpp b/esphome/components/bmp3xx/bmp3xx.cpp
index 410b7a3173..de28fd76ff 100644
--- a/esphome/components/bmp3xx/bmp3xx.cpp
+++ b/esphome/components/bmp3xx/bmp3xx.cpp
@@ -8,6 +8,7 @@
 #include "bmp3xx.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace bmp3xx {
@@ -198,8 +199,9 @@ void BMP3XXComponent::update() {
     return;
   }
 
-  ESP_LOGVV(TAG, "measurement time %d", uint32_t(ceilf(meas_time)));
-  this->set_timeout("data", uint32_t(ceilf(meas_time)), [this]() {
+  const uint32_t meas_timeout = uint32_t(ceilf(meas_time));
+  ESP_LOGVV(TAG, "measurement time %" PRIu32, meas_timeout);
+  this->set_timeout("data", meas_timeout, [this]() {
     float temperature = 0.0f;
     float pressure = 0.0f;
     if (this->pressure_sensor_ != nullptr) {
diff --git a/esphome/components/canbus/canbus.cpp b/esphome/components/canbus/canbus.cpp
index 8cffebdaa0..73b86cba87 100644
--- a/esphome/components/canbus/canbus.cpp
+++ b/esphome/components/canbus/canbus.cpp
@@ -51,9 +51,9 @@ void Canbus::send_data(uint32_t can_id, bool use_extended_id, bool remote_transm
 
 void Canbus::add_trigger(CanbusTrigger *trigger) {
   if (trigger->use_extended_id_) {
-    ESP_LOGVV(TAG, "add trigger for extended canid=0x%08x", trigger->can_id_);
+    ESP_LOGVV(TAG, "add trigger for extended canid=0x%08" PRIx32, trigger->can_id_);
   } else {
-    ESP_LOGVV(TAG, "add trigger for std canid=0x%03x", trigger->can_id_);
+    ESP_LOGVV(TAG, "add trigger for std canid=0x%03" PRIx32, trigger->can_id_);
   }
   this->triggers_.push_back(trigger);
 };
diff --git a/esphome/components/cd74hc4067/cd74hc4067.cpp b/esphome/components/cd74hc4067/cd74hc4067.cpp
index ea789c2d8c..f7629df3ca 100644
--- a/esphome/components/cd74hc4067/cd74hc4067.cpp
+++ b/esphome/components/cd74hc4067/cd74hc4067.cpp
@@ -1,5 +1,6 @@
 #include "cd74hc4067.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace cd74hc4067 {
@@ -27,7 +28,7 @@ void CD74HC4067Component::dump_config() {
   LOG_PIN("  S1 Pin: ", this->pin_s1_);
   LOG_PIN("  S2 Pin: ", this->pin_s2_);
   LOG_PIN("  S3 Pin: ", this->pin_s3_);
-  ESP_LOGCONFIG(TAG, "switch delay: %d", this->switch_delay_);
+  ESP_LOGCONFIG(TAG, "switch delay: %" PRIu32, this->switch_delay_);
 }
 
 void CD74HC4067Component::activate_pin(uint8_t pin) {
diff --git a/esphome/components/cse7761/cse7761.cpp b/esphome/components/cse7761/cse7761.cpp
index 3b8364f0bc..337996f6ef 100644
--- a/esphome/components/cse7761/cse7761.cpp
+++ b/esphome/components/cse7761/cse7761.cpp
@@ -217,7 +217,7 @@ void CSE7761Component::get_data_() {
     this->voltage_sensor_->publish_state(voltage);
   }
 
-  for (uint32_t channel = 0; channel < 2; channel++) {
+  for (uint8_t channel = 0; channel < 2; channel++) {
     // Active power = PowerPA * PowerPAC * 1000 / 0x80000000
     float active_power = (float) this->data_.active_power[channel] / this->coefficient_by_unit_(POWER_PAC);  // W
     float amps = (float) this->data_.current_rms[channel] / this->coefficient_by_unit_(RMS_IAC);             // A
diff --git a/esphome/components/cse7766/cse7766.cpp b/esphome/components/cse7766/cse7766.cpp
index f232f35ea6..60132fd98f 100644
--- a/esphome/components/cse7766/cse7766.cpp
+++ b/esphome/components/cse7766/cse7766.cpp
@@ -1,5 +1,6 @@
 #include "cse7766.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace cse7766 {
@@ -162,7 +163,7 @@ void CSE7766Component::update() {
     if (counts != 0) {
       const auto avg = acc / counts;
 
-      ESP_LOGV(TAG, "Got %s_acc=%.2f %s_counts=%d %s=%.1f", name, acc, name, counts, name, avg);
+      ESP_LOGV(TAG, "Got %s_acc=%.2f %s_counts=%" PRIu32 " %s=%.1f", name, acc, name, counts, name, avg);
 
       if (sensor != nullptr) {
         sensor->publish_state(avg);
@@ -178,7 +179,8 @@ void CSE7766Component::update() {
   publish_state("power", this->power_sensor_, this->power_acc_, this->power_counts_);
 
   if (this->energy_total_counts_ != 0) {
-    ESP_LOGV(TAG, "Got energy_total=%.2f energy_total_counts=%d", this->energy_total_, this->energy_total_counts_);
+    ESP_LOGV(TAG, "Got energy_total=%.2f energy_total_counts=%" PRIu32, this->energy_total_,
+             this->energy_total_counts_);
 
     if (this->energy_sensor_ != nullptr) {
       this->energy_sensor_->publish_state(this->energy_total_);
diff --git a/esphome/components/ethernet/ethernet_component.cpp b/esphome/components/ethernet/ethernet_component.cpp
index 03fdc49338..50d5855e6a 100644
--- a/esphome/components/ethernet/ethernet_component.cpp
+++ b/esphome/components/ethernet/ethernet_component.cpp
@@ -5,6 +5,7 @@
 
 #ifdef USE_ESP32
 
+#include <cinttypes>
 #include <lwip/dns.h>
 #include "esp_event.h"
 
@@ -275,7 +276,7 @@ void EthernetComponent::got_ip_event_handler(void *arg, esp_event_base_t event_b
 #if ENABLE_IPV6
 void EthernetComponent::got_ip6_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id,
                                               void *event_data) {
-  ESP_LOGV(TAG, "[Ethernet event] ETH Got IP6 (num=%d)", event_id);
+  ESP_LOGV(TAG, "[Ethernet event] ETH Got IP6 (num=%" PRId32 ")", event_id);
   global_eth_component->got_ipv6_ = true;
   global_eth_component->ipv6_count_ += 1;
 }
diff --git a/esphome/components/fingerprint_grow/fingerprint_grow.cpp b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
index 4043f32dcb..8729e0f4bf 100644
--- a/esphome/components/fingerprint_grow/fingerprint_grow.cpp
+++ b/esphome/components/fingerprint_grow/fingerprint_grow.cpp
@@ -1,5 +1,6 @@
 #include "fingerprint_grow.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace fingerprint_grow {
@@ -204,7 +205,7 @@ bool FingerprintGrowComponent::check_password_() {
 }
 
 bool FingerprintGrowComponent::set_password_() {
-  ESP_LOGI(TAG, "Setting new password: %d", this->new_password_);
+  ESP_LOGI(TAG, "Setting new password: %" PRIu32, this->new_password_);
   this->data_ = {SET_PASSWORD, (uint8_t) (this->new_password_ >> 24), (uint8_t) (this->new_password_ >> 16),
                  (uint8_t) (this->new_password_ >> 8), (uint8_t) (this->new_password_ & 0xFF)};
   if (this->send_command_() == OK) {
diff --git a/esphome/components/nfc/ndef_message.cpp b/esphome/components/nfc/ndef_message.cpp
index 461856d377..e7304445c5 100644
--- a/esphome/components/nfc/ndef_message.cpp
+++ b/esphome/components/nfc/ndef_message.cpp
@@ -1,4 +1,5 @@
 #include "ndef_message.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace nfc {
@@ -32,7 +33,7 @@ NdefMessage::NdefMessage(std::vector<uint8_t> &data) {
       id_length = data[index++];
     }
 
-    ESP_LOGVV(TAG, "Lengths: type=%d, payload=%d, id=%d", type_length, payload_length, id_length);
+    ESP_LOGVV(TAG, "Lengths: type=%d, payload=%" PRIu32 ", id=%d", type_length, payload_length, id_length);
 
     std::string type_str(data.begin() + index, data.begin() + index + type_length);
 
diff --git a/esphome/components/pid/pid_autotuner.cpp b/esphome/components/pid/pid_autotuner.cpp
index 1b3ddebcc5..28d16e17ab 100644
--- a/esphome/components/pid/pid_autotuner.cpp
+++ b/esphome/components/pid/pid_autotuner.cpp
@@ -1,5 +1,6 @@
 #include "pid_autotuner.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 #ifndef M_PI
 #define M_PI 3.1415926535897932384626433
@@ -108,7 +109,7 @@ PIDAutotuner::PIDAutotuneResult PIDAutotuner::update(float setpoint, float proce
     }
     uint32_t phase = this->relay_function_.phase_count;
     ESP_LOGVV(TAG, "%s: >", this->id_.c_str());
-    ESP_LOGVV(TAG, "  Phase %u, enough=%u", phase, enough_data_phase_);
+    ESP_LOGVV(TAG, "  Phase %" PRIu32 ", enough=%" PRIu32, phase, enough_data_phase_);
 
     if (this->enough_data_phase_ == 0) {
       this->enough_data_phase_ = phase;
@@ -186,8 +187,8 @@ void PIDAutotuner::dump_config() {
     ESP_LOGD(TAG, "  Autotune is still running!");
     ESP_LOGD(TAG, "  Status: Trying to reach %.2f °C", setpoint_ - relay_function_.current_target_error());
     ESP_LOGD(TAG, "  Stats so far:");
-    ESP_LOGD(TAG, "    Phases: %u", relay_function_.phase_count);
-    ESP_LOGD(TAG, "    Detected %u zero-crossings", frequency_detector_.zerocrossing_intervals.size());  // NOLINT
+    ESP_LOGD(TAG, "    Phases: %" PRIu32, relay_function_.phase_count);
+    ESP_LOGD(TAG, "    Detected %zu zero-crossings", frequency_detector_.zerocrossing_intervals.size());
     ESP_LOGD(TAG, "    Current Phase Min: %.2f, Max: %.2f", amplitude_detector_.phase_min,
              amplitude_detector_.phase_max);
   }
diff --git a/esphome/components/pzem004t/pzem004t.cpp b/esphome/components/pzem004t/pzem004t.cpp
index e5418765bd..35b66b03f2 100644
--- a/esphome/components/pzem004t/pzem004t.cpp
+++ b/esphome/components/pzem004t/pzem004t.cpp
@@ -1,5 +1,6 @@
 #include "pzem004t.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace pzem004t {
@@ -75,7 +76,7 @@ void PZEM004T::loop() {
         uint32_t energy = (uint32_t(resp[1]) << 16) | (uint32_t(resp[2]) << 8) | (uint32_t(resp[3]));
         if (this->energy_sensor_ != nullptr)
           this->energy_sensor_->publish_state(energy);
-        ESP_LOGD(TAG, "Got Energy %u Wh", energy);
+        ESP_LOGD(TAG, "Got Energy %" PRIu32 " Wh", energy);
         this->write_state_(DONE);
         break;
       }
diff --git a/esphome/components/remote_base/drayton_protocol.cpp b/esphome/components/remote_base/drayton_protocol.cpp
index 12a553455f..fb5f37b470 100644
--- a/esphome/components/remote_base/drayton_protocol.cpp
+++ b/esphome/components/remote_base/drayton_protocol.cpp
@@ -138,9 +138,12 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
     return {};
   }
 
-  ESP_LOGVV(TAG, "Decode Drayton: %d, %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", src.size(),
-            src.peek(0), src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6), src.peek(7),
-            src.peek(8), src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14),
+  ESP_LOGVV(TAG,
+            "Decode Drayton: %" PRId32 ", %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32
+            " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 " %" PRId32 "",
+            src.size(), src.peek(0), src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6),
+            src.peek(7), src.peek(8), src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14),
             src.peek(15), src.peek(16), src.peek(17), src.peek(18), src.peek(19));
 
   // If first preamble item is a space, skip it
@@ -150,7 +153,8 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
 
   // Look for sync pulse, after. If sucessful index points to space of sync symbol
   for (uint16_t preamble = 0; preamble <= NBITS_PREAMBLE * 2; preamble += 2) {
-    ESP_LOGVV(TAG, "Decode Drayton: preamble %d  %d %d", preamble, src.peek(preamble), src.peek(preamble + 1));
+    ESP_LOGVV(TAG, "Decode Drayton: preamble %d  %" PRId32 " %" PRId32, preamble, src.peek(preamble),
+              src.peek(preamble + 1));
     if (src.peek_mark(2 * BIT_TIME_US, preamble) &&
         (src.peek_space(2 * BIT_TIME_US, preamble + 1) || src.peek_space(3 * BIT_TIME_US, preamble + 1))) {
       src.advance(preamble + 1);
@@ -177,7 +181,7 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
   // if there is no transition at the start of the bit period, then the transition in the middle of
   // the previous bit period.
   while (--bit >= 1) {
-    ESP_LOGVV(TAG, "Decode Drayton: Data, %2d %08x", bit, out_data);
+    ESP_LOGVV(TAG, "Decode Drayton: Data, %2d %08" PRIx32, bit, out_data);
     if ((src.expect_space(BIT_TIME_US) || src.expect_space(2 * BIT_TIME_US)) &&
         (src.expect_mark(BIT_TIME_US) || src.peek_mark(2 * BIT_TIME_US))) {
       out_data |= 0 << bit;
@@ -185,7 +189,7 @@ optional<DraytonData> DraytonProtocol::decode(RemoteReceiveData src) {
                (src.expect_space(BIT_TIME_US) || src.peek_space(2 * BIT_TIME_US))) {
       out_data |= 1 << bit;
     } else {
-      ESP_LOGVV(TAG, "Decode Drayton: Fail 2, %2d %08x", bit, out_data);
+      ESP_LOGVV(TAG, "Decode Drayton: Fail 2, %2d %08" PRIx32, bit, out_data);
       return {};
     }
   }
diff --git a/esphome/components/remote_base/remote_base.cpp b/esphome/components/remote_base/remote_base.cpp
index 7fe5e47ee7..40c699e8ea 100644
--- a/esphome/components/remote_base/remote_base.cpp
+++ b/esphome/components/remote_base/remote_base.cpp
@@ -125,7 +125,7 @@ void RemoteTransmitterBase::send_(uint32_t send_times, uint32_t send_wait) {
   const auto &vec = this->temp_.get_data();
   char buffer[256];
   uint32_t buffer_offset = 0;
-  buffer_offset += sprintf(buffer, "Sending times=%u wait=%ums: ", send_times, send_wait);
+  buffer_offset += sprintf(buffer, "Sending times=%" PRIu32 " wait=%" PRIu32 "ms: ", send_times, send_wait);
 
   for (size_t i = 0; i < vec.size(); i++) {
     const int32_t value = vec[i];
@@ -133,9 +133,9 @@ void RemoteTransmitterBase::send_(uint32_t send_times, uint32_t send_wait) {
     int written;
 
     if (i + 1 < vec.size()) {
-      written = snprintf(buffer + buffer_offset, remaining_length, "%d, ", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32 ", ", value);
     } else {
-      written = snprintf(buffer + buffer_offset, remaining_length, "%d", value);
+      written = snprintf(buffer + buffer_offset, remaining_length, "%" PRId32, value);
     }
 
     if (written < 0 || written >= int(remaining_length)) {
@@ -145,9 +145,9 @@ void RemoteTransmitterBase::send_(uint32_t send_times, uint32_t send_wait) {
       buffer_offset = 0;
       written = sprintf(buffer, "  ");
       if (i + 1 < vec.size()) {
-        written += sprintf(buffer + written, "%d, ", value);
+        written += sprintf(buffer + written, "%" PRId32 ", ", value);
       } else {
-        written += sprintf(buffer + written, "%d", value);
+        written += sprintf(buffer + written, "%" PRId32, value);
       }
     }
 
diff --git a/esphome/components/remote_receiver/remote_receiver_esp32.cpp b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
index 1ebb5a5955..d19ab695e1 100644
--- a/esphome/components/remote_receiver/remote_receiver_esp32.cpp
+++ b/esphome/components/remote_receiver/remote_receiver_esp32.cpp
@@ -92,14 +92,18 @@ void RemoteReceiverComponent::decode_rmt_(rmt_item32_t *item, size_t len) {
   ESP_LOGVV(TAG, "START:");
   for (size_t i = 0; i < item_count; i++) {
     if (item[i].level0) {
-      ESP_LOGVV(TAG, "%u A: ON %uus (%u ticks)", i, this->to_microseconds_(item[i].duration0), item[i].duration0);
+      ESP_LOGVV(TAG, "%zu A: ON %" PRIu32 "us (%u ticks)", i, this->to_microseconds_(item[i].duration0),
+                item[i].duration0);
     } else {
-      ESP_LOGVV(TAG, "%u A: OFF %uus (%u ticks)", i, this->to_microseconds_(item[i].duration0), item[i].duration0);
+      ESP_LOGVV(TAG, "%zu A: OFF %" PRIu32 "us (%u ticks)", i, this->to_microseconds_(item[i].duration0),
+                item[i].duration0);
     }
     if (item[i].level1) {
-      ESP_LOGVV(TAG, "%u B: ON %uus (%u ticks)", i, this->to_microseconds_(item[i].duration1), item[i].duration1);
+      ESP_LOGVV(TAG, "%zu B: ON %" PRIu32 "us (%u ticks)", i, this->to_microseconds_(item[i].duration1),
+                item[i].duration1);
     } else {
-      ESP_LOGVV(TAG, "%u B: OFF %uus (%u ticks)", i, this->to_microseconds_(item[i].duration1), item[i].duration1);
+      ESP_LOGVV(TAG, "%zu B: OFF %" PRIu32 "us (%u ticks)", i, this->to_microseconds_(item[i].duration1),
+                item[i].duration1);
     }
   }
   ESP_LOGVV(TAG, "\n");
diff --git a/esphome/components/rf_bridge/rf_bridge.cpp b/esphome/components/rf_bridge/rf_bridge.cpp
index c34b3d2dc4..3b3e00a416 100644
--- a/esphome/components/rf_bridge/rf_bridge.cpp
+++ b/esphome/components/rf_bridge/rf_bridge.cpp
@@ -1,5 +1,6 @@
 #include "rf_bridge.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 #include <cstring>
 
 namespace esphome {
@@ -53,8 +54,10 @@ bool RFBridgeComponent::parse_bridge_byte_(uint8_t byte) {
         ESP_LOGD(TAG, "Learning success");
       }
 
-      ESP_LOGI(TAG, "Received RFBridge Code: sync=0x%04X low=0x%04X high=0x%04X code=0x%06X", data.sync, data.low,
-               data.high, data.code);
+      ESP_LOGI(TAG,
+               "Received RFBridge Code: sync=0x%04" PRIX16 " low=0x%04" PRIX16 " high=0x%04" PRIX16
+               " code=0x%06" PRIX32,
+               data.sync, data.low, data.high, data.code);
       this->data_callback_.call(data);
       break;
     }
@@ -144,8 +147,8 @@ void RFBridgeComponent::loop() {
 }
 
 void RFBridgeComponent::send_code(RFBridgeData data) {
-  ESP_LOGD(TAG, "Sending code: sync=0x%04X low=0x%04X high=0x%04X code=0x%06X", data.sync, data.low, data.high,
-           data.code);
+  ESP_LOGD(TAG, "Sending code: sync=0x%04" PRIX16 " low=0x%04" PRIX16 " high=0x%04" PRIX16 " code=0x%06" PRIX32,
+           data.sync, data.low, data.high, data.code);
   this->write(RF_CODE_START);
   this->write(RF_CODE_RFOUT);
   this->write((data.sync >> 8) & 0xFF);
diff --git a/esphome/components/servo/servo.cpp b/esphome/components/servo/servo.cpp
index 78fc45c679..666c017dea 100644
--- a/esphome/components/servo/servo.cpp
+++ b/esphome/components/servo/servo.cpp
@@ -1,6 +1,7 @@
 #include "servo.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace servo {
@@ -14,8 +15,8 @@ void Servo::dump_config() {
   ESP_LOGCONFIG(TAG, "  Idle Level: %.1f%%", this->idle_level_ * 100.0f);
   ESP_LOGCONFIG(TAG, "  Min Level: %.1f%%", this->min_level_ * 100.0f);
   ESP_LOGCONFIG(TAG, "  Max Level: %.1f%%", this->max_level_ * 100.0f);
-  ESP_LOGCONFIG(TAG, "  auto detach time: %d ms", this->auto_detach_time_);
-  ESP_LOGCONFIG(TAG, "  run duration: %d ms", this->transition_length_);
+  ESP_LOGCONFIG(TAG, "  auto detach time: %" PRIu32 " ms", this->auto_detach_time_);
+  ESP_LOGCONFIG(TAG, "  run duration: %" PRIu32 " ms", this->transition_length_);
 }
 
 void Servo::loop() {
diff --git a/esphome/components/sgp4x/sgp4x.cpp b/esphome/components/sgp4x/sgp4x.cpp
index 561d41e225..7e474b9371 100644
--- a/esphome/components/sgp4x/sgp4x.cpp
+++ b/esphome/components/sgp4x/sgp4x.cpp
@@ -166,7 +166,7 @@ bool SGP4xComponent::measure_gas_indices_(int32_t &voc, int32_t &nox) {
   if (nox_sensor_) {
     nox = nox_algorithm_.process(nox_sraw);
   }
-  ESP_LOGV(TAG, "VOC = %d, NOx = %d", voc, nox);
+  ESP_LOGV(TAG, "VOC = %" PRId32 ", NOx = %" PRId32, voc, nox);
   // Store baselines after defined interval or if the difference between current and stored baseline becomes too
   // much
   if (this->store_baseline_ && this->seconds_since_last_store_ > SHORTEST_BASELINE_STORE_INTERVAL) {
diff --git a/esphome/components/spi/spi_arduino.cpp b/esphome/components/spi/spi_arduino.cpp
index 2e6b2d6064..4628486550 100644
--- a/esphome/components/spi/spi_arduino.cpp
+++ b/esphome/components/spi/spi_arduino.cpp
@@ -18,7 +18,7 @@ class SPIDelegateHw : public SPIDelegate {
 #elif defined(ESP8266)
     // Arduino ESP8266 library has mangled values for SPI modes :-(
     auto mode = (this->mode_ & 0x01) + ((this->mode_ & 0x02) << 3);
-    ESP_LOGV(TAG, "8266 mangled SPI mode 0x%X", mode);
+    ESP_LOGVV(TAG, "8266 mangled SPI mode 0x%X", mode);
     SPISettings const settings(this->data_rate_, this->bit_order_, mode);
 #else
     SPISettings const settings(this->data_rate_, this->bit_order_, this->mode_);
diff --git a/esphome/components/sprinkler/sprinkler.cpp b/esphome/components/sprinkler/sprinkler.cpp
index 6900c9461b..982d9add1a 100644
--- a/esphome/components/sprinkler/sprinkler.cpp
+++ b/esphome/components/sprinkler/sprinkler.cpp
@@ -4,6 +4,7 @@
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 #include <utility>
 
 namespace esphome {
@@ -875,7 +876,7 @@ void Sprinkler::queue_valve(optional<size_t> valve_number, optional<uint32_t> ru
     if (this->is_a_valid_valve(valve_number.value()) && (this->queued_valves_.size() < this->max_queue_size_)) {
       SprinklerQueueItem item{valve_number.value(), run_duration.value()};
       this->queued_valves_.insert(this->queued_valves_.begin(), item);
-      ESP_LOGD(TAG, "Valve %u placed into queue with run duration of %u seconds", valve_number.value_or(0),
+      ESP_LOGD(TAG, "Valve %zu placed into queue with run duration of %" PRIu32 " seconds", valve_number.value_or(0),
                run_duration.value_or(0));
     }
   }
@@ -954,7 +955,7 @@ void Sprinkler::pause() {
   this->paused_valve_ = this->active_valve();
   this->resume_duration_ = this->time_remaining_active_valve();
   this->shutdown(false);
-  ESP_LOGD(TAG, "Paused valve %u with %u seconds remaining", this->paused_valve_.value_or(0),
+  ESP_LOGD(TAG, "Paused valve %zu with %" PRIu32 " seconds remaining", this->paused_valve_.value_or(0),
            this->resume_duration_.value_or(0));
 }
 
@@ -967,7 +968,7 @@ void Sprinkler::resume() {
   if (this->paused_valve_.has_value() && (this->resume_duration_.has_value())) {
     // Resume only if valve has not been completed yet
     if (!this->valve_cycle_complete_(this->paused_valve_.value())) {
-      ESP_LOGD(TAG, "Resuming valve %u with %u seconds remaining", this->paused_valve_.value_or(0),
+      ESP_LOGD(TAG, "Resuming valve %zu with %" PRIu32 " seconds remaining", this->paused_valve_.value_or(0),
                this->resume_duration_.value_or(0));
       this->fsm_request_(this->paused_valve_.value(), this->resume_duration_.value());
     }
@@ -1389,7 +1390,8 @@ void Sprinkler::load_next_valve_run_request_(const optional<size_t> first_valve)
       this->next_req_.set_run_duration(
           this->valve_run_duration_adjusted(this->next_valve_number_in_cycle_(first_valve).value_or(0)));
     } else if ((this->repeat_count_++ < this->repeat().value_or(0))) {
-      ESP_LOGD(TAG, "Repeating - starting cycle %u of %u", this->repeat_count_ + 1, this->repeat().value_or(0) + 1);
+      ESP_LOGD(TAG, "Repeating - starting cycle %" PRIu32 " of %" PRIu32, this->repeat_count_ + 1,
+               this->repeat().value_or(0) + 1);
       // if there are repeats remaining and no more valves were left in the cycle, start a new cycle
       this->prep_full_cycle_();
       if (this->next_valve_number_in_cycle_().has_value()) {  // this should always succeed here, but just in case...
@@ -1420,7 +1422,7 @@ void Sprinkler::start_valve_(SprinklerValveRunRequest *req) {
   for (auto &vo : this->valve_op_) {  // find the first available SprinklerValveOperator, load it and start it up
     if (vo.state() == IDLE) {
       auto run_duration = req->run_duration() ? req->run_duration() : this->valve_run_duration_adjusted(req->valve());
-      ESP_LOGD(TAG, "%s is starting valve %u for %u seconds, cycle %u of %u",
+      ESP_LOGD(TAG, "%s is starting valve %zu for %" PRIu32 " seconds, cycle %" PRIu32 " of %" PRIu32,
                this->req_as_str_(req->request_is_from()).c_str(), req->valve(), run_duration, this->repeat_count_ + 1,
                this->repeat().value_or(0) + 1);
       req->set_valve_operator(&vo);
@@ -1645,7 +1647,7 @@ void Sprinkler::start_timer_(const SprinklerTimerIndex timer_index) {
     this->timer_[timer_index].start_time = millis();
     this->timer_[timer_index].active = true;
   }
-  ESP_LOGVV(TAG, "Timer %u started for %u sec", static_cast<size_t>(timer_index),
+  ESP_LOGVV(TAG, "Timer %zu started for %" PRIu32 " sec", static_cast<size_t>(timer_index),
             this->timer_duration_(timer_index) / 1000);
 }
 
@@ -1684,48 +1686,48 @@ void Sprinkler::sm_timer_callback_() {
 void Sprinkler::dump_config() {
   ESP_LOGCONFIG(TAG, "Sprinkler Controller -- %s", this->name_.c_str());
   if (this->manual_selection_delay_.has_value()) {
-    ESP_LOGCONFIG(TAG, "  Manual Selection Delay: %u seconds", this->manual_selection_delay_.value_or(0));
+    ESP_LOGCONFIG(TAG, "  Manual Selection Delay: %" PRIu32 " seconds", this->manual_selection_delay_.value_or(0));
   }
   if (this->repeat().has_value()) {
-    ESP_LOGCONFIG(TAG, "  Repeat Cycles: %u times", this->repeat().value_or(0));
+    ESP_LOGCONFIG(TAG, "  Repeat Cycles: %" PRIu32 " times", this->repeat().value_or(0));
   }
   if (this->start_delay_) {
     if (this->start_delay_is_valve_delay_) {
-      ESP_LOGCONFIG(TAG, "  Pump Start Valve Delay: %u seconds", this->start_delay_);
+      ESP_LOGCONFIG(TAG, "  Pump Start Valve Delay: %" PRIu32 " seconds", this->start_delay_);
     } else {
-      ESP_LOGCONFIG(TAG, "  Pump Start Pump Delay: %u seconds", this->start_delay_);
+      ESP_LOGCONFIG(TAG, "  Pump Start Pump Delay: %" PRIu32 " seconds", this->start_delay_);
     }
   }
   if (this->stop_delay_) {
     if (this->stop_delay_is_valve_delay_) {
-      ESP_LOGCONFIG(TAG, "  Pump Stop Valve Delay: %u seconds", this->stop_delay_);
+      ESP_LOGCONFIG(TAG, "  Pump Stop Valve Delay: %" PRIu32 " seconds", this->stop_delay_);
     } else {
-      ESP_LOGCONFIG(TAG, "  Pump Stop Pump Delay: %u seconds", this->stop_delay_);
+      ESP_LOGCONFIG(TAG, "  Pump Stop Pump Delay: %" PRIu32 " seconds", this->stop_delay_);
     }
   }
   if (this->switching_delay_.has_value()) {
     if (this->valve_overlap_) {
-      ESP_LOGCONFIG(TAG, "  Valve Overlap: %u seconds", this->switching_delay_.value_or(0));
+      ESP_LOGCONFIG(TAG, "  Valve Overlap: %" PRIu32 " seconds", this->switching_delay_.value_or(0));
     } else {
-      ESP_LOGCONFIG(TAG, "  Valve Open Delay: %u seconds", this->switching_delay_.value_or(0));
+      ESP_LOGCONFIG(TAG, "  Valve Open Delay: %" PRIu32 " seconds", this->switching_delay_.value_or(0));
       ESP_LOGCONFIG(TAG, "  Pump Switch Off During Valve Open Delay: %s",
                     YESNO(this->pump_switch_off_during_valve_open_delay_));
     }
   }
   for (size_t valve_number = 0; valve_number < this->number_of_valves(); valve_number++) {
-    ESP_LOGCONFIG(TAG, "  Valve %u:", valve_number);
+    ESP_LOGCONFIG(TAG, "  Valve %zu:", valve_number);
     ESP_LOGCONFIG(TAG, "    Name: %s", this->valve_name(valve_number));
-    ESP_LOGCONFIG(TAG, "    Run Duration: %u seconds", this->valve_run_duration(valve_number));
+    ESP_LOGCONFIG(TAG, "    Run Duration: %" PRIu32 " seconds", this->valve_run_duration(valve_number));
     if (this->valve_[valve_number].valve_switch.pulse_duration()) {
-      ESP_LOGCONFIG(TAG, "    Pulse Duration: %u milliseconds",
+      ESP_LOGCONFIG(TAG, "    Pulse Duration: %" PRIu32 " milliseconds",
                     this->valve_[valve_number].valve_switch.pulse_duration());
     }
   }
   if (!this->pump_.empty()) {
-    ESP_LOGCONFIG(TAG, "  Total number of pumps: %u", this->pump_.size());
+    ESP_LOGCONFIG(TAG, "  Total number of pumps: %zu", this->pump_.size());
   }
   if (!this->valve_.empty()) {
-    ESP_LOGCONFIG(TAG, "  Total number of valves: %u", this->valve_.size());
+    ESP_LOGCONFIG(TAG, "  Total number of valves: %zu", this->valve_.size());
   }
 }
 
diff --git a/esphome/components/status_led/light/status_led_light.cpp b/esphome/components/status_led/light/status_led_light.cpp
index b47d1f5bd0..549024c4df 100644
--- a/esphome/components/status_led/light/status_led_light.cpp
+++ b/esphome/components/status_led/light/status_led_light.cpp
@@ -1,6 +1,7 @@
 #include "status_led_light.h"
 #include "esphome/core/log.h"
 #include "esphome/core/application.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace status_led {
@@ -11,7 +12,7 @@ void StatusLEDLightOutput::loop() {
   uint32_t new_state = App.get_app_state() & STATUS_LED_MASK;
 
   if (new_state != this->last_app_state_) {
-    ESP_LOGV(TAG, "New app state 0x%08X", new_state);
+    ESP_LOGV(TAG, "New app state 0x%08" PRIX32, new_state);
   }
 
   if ((new_state & STATUS_LED_ERROR) != 0u) {
diff --git a/esphome/components/thermostat/thermostat_climate.cpp b/esphome/components/thermostat/thermostat_climate.cpp
index 386e13dc37..73b061b07c 100644
--- a/esphome/components/thermostat/thermostat_climate.cpp
+++ b/esphome/components/thermostat/thermostat_climate.cpp
@@ -1,5 +1,6 @@
 #include "thermostat_climate.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace thermostat {
@@ -1283,11 +1284,13 @@ void ThermostatClimate::dump_config() {
     ESP_LOGCONFIG(TAG, "    Overrun: %.1f°C", this->cooling_overrun_);
     if ((this->supplemental_cool_delta_ > 0) || (this->timer_duration_(thermostat::TIMER_COOLING_MAX_RUN_TIME) > 0)) {
       ESP_LOGCONFIG(TAG, "    Supplemental Delta: %.1f°C", this->supplemental_cool_delta_);
-      ESP_LOGCONFIG(TAG, "    Maximum Run Time: %us",
+      ESP_LOGCONFIG(TAG, "    Maximum Run Time: %" PRIu32 "s",
                     this->timer_duration_(thermostat::TIMER_COOLING_MAX_RUN_TIME) / 1000);
     }
-    ESP_LOGCONFIG(TAG, "    Minimum Off Time: %us", this->timer_duration_(thermostat::TIMER_COOLING_OFF) / 1000);
-    ESP_LOGCONFIG(TAG, "    Minimum Run Time: %us", this->timer_duration_(thermostat::TIMER_COOLING_ON) / 1000);
+    ESP_LOGCONFIG(TAG, "    Minimum Off Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_COOLING_OFF) / 1000);
+    ESP_LOGCONFIG(TAG, "    Minimum Run Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_COOLING_ON) / 1000);
   }
   if (this->supports_heat_) {
     ESP_LOGCONFIG(TAG, "  Heating Parameters:");
@@ -1295,24 +1298,28 @@ void ThermostatClimate::dump_config() {
     ESP_LOGCONFIG(TAG, "    Overrun: %.1f°C", this->heating_overrun_);
     if ((this->supplemental_heat_delta_ > 0) || (this->timer_duration_(thermostat::TIMER_HEATING_MAX_RUN_TIME) > 0)) {
       ESP_LOGCONFIG(TAG, "    Supplemental Delta: %.1f°C", this->supplemental_heat_delta_);
-      ESP_LOGCONFIG(TAG, "    Maximum Run Time: %us",
+      ESP_LOGCONFIG(TAG, "    Maximum Run Time: %" PRIu32 "s",
                     this->timer_duration_(thermostat::TIMER_HEATING_MAX_RUN_TIME) / 1000);
     }
-    ESP_LOGCONFIG(TAG, "    Minimum Off Time: %us", this->timer_duration_(thermostat::TIMER_HEATING_OFF) / 1000);
-    ESP_LOGCONFIG(TAG, "    Minimum Run Time: %us", this->timer_duration_(thermostat::TIMER_HEATING_ON) / 1000);
+    ESP_LOGCONFIG(TAG, "    Minimum Off Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_HEATING_OFF) / 1000);
+    ESP_LOGCONFIG(TAG, "    Minimum Run Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_HEATING_ON) / 1000);
   }
   if (this->supports_fan_only_) {
-    ESP_LOGCONFIG(TAG, "  Fanning Minimum Off Time: %us", this->timer_duration_(thermostat::TIMER_FANNING_OFF) / 1000);
-    ESP_LOGCONFIG(TAG, "  Fanning Minimum Run Time: %us", this->timer_duration_(thermostat::TIMER_FANNING_ON) / 1000);
+    ESP_LOGCONFIG(TAG, "  Fanning Minimum Off Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_FANNING_OFF) / 1000);
+    ESP_LOGCONFIG(TAG, "  Fanning Minimum Run Time: %" PRIu32 "s",
+                  this->timer_duration_(thermostat::TIMER_FANNING_ON) / 1000);
   }
   if (this->supports_fan_mode_on_ || this->supports_fan_mode_off_ || this->supports_fan_mode_auto_ ||
       this->supports_fan_mode_low_ || this->supports_fan_mode_medium_ || this->supports_fan_mode_high_ ||
       this->supports_fan_mode_middle_ || this->supports_fan_mode_focus_ || this->supports_fan_mode_diffuse_ ||
       this->supports_fan_mode_quiet_) {
-    ESP_LOGCONFIG(TAG, "  Minimum Fan Mode Switching Time: %us",
+    ESP_LOGCONFIG(TAG, "  Minimum Fan Mode Switching Time: %" PRIu32 "s",
                   this->timer_duration_(thermostat::TIMER_FAN_MODE) / 1000);
   }
-  ESP_LOGCONFIG(TAG, "  Minimum Idle Time: %us", this->timer_[thermostat::TIMER_IDLE_ON].time / 1000);
+  ESP_LOGCONFIG(TAG, "  Minimum Idle Time: %" PRIu32 "s", this->timer_[thermostat::TIMER_IDLE_ON].time / 1000);
   ESP_LOGCONFIG(TAG, "  Supports AUTO: %s", YESNO(this->supports_auto_));
   ESP_LOGCONFIG(TAG, "  Supports HEAT/COOL: %s", YESNO(this->supports_heat_cool_));
   ESP_LOGCONFIG(TAG, "  Supports COOL: %s", YESNO(this->supports_cool_));
diff --git a/esphome/components/tof10120/tof10120_sensor.cpp b/esphome/components/tof10120/tof10120_sensor.cpp
index 5cd086938e..32cd604be9 100644
--- a/esphome/components/tof10120/tof10120_sensor.cpp
+++ b/esphome/components/tof10120/tof10120_sensor.cpp
@@ -1,6 +1,7 @@
 #include "tof10120_sensor.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include <cinttypes>
 
 // Very basic support for TOF10120 distance sensor
 
@@ -44,7 +45,7 @@ void TOF10120Sensor::update() {
   }
 
   uint32_t distance_mm = (data[0] << 8) | data[1];
-  ESP_LOGI(TAG, "Data read: %dmm", distance_mm);
+  ESP_LOGI(TAG, "Data read: %" PRIu32 "mm", distance_mm);
 
   if (distance_mm == TOF10120_OUT_OF_RANGE_VALUE) {
     ESP_LOGW(TAG, "Distance measurement out of range");
diff --git a/esphome/components/tuya/sensor/tuya_sensor.cpp b/esphome/components/tuya/sensor/tuya_sensor.cpp
index 1e39c1bc35..673471a6ce 100644
--- a/esphome/components/tuya/sensor/tuya_sensor.cpp
+++ b/esphome/components/tuya/sensor/tuya_sensor.cpp
@@ -1,5 +1,6 @@
 #include "esphome/core/log.h"
 #include "tuya_sensor.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace tuya {
@@ -18,7 +19,7 @@ void TuyaSensor::setup() {
       ESP_LOGV(TAG, "MCU reported sensor %u is: %u", datapoint.id, datapoint.value_enum);
       this->publish_state(datapoint.value_enum);
     } else if (datapoint.type == TuyaDatapointType::BITMASK) {
-      ESP_LOGV(TAG, "MCU reported sensor %u is: %x", datapoint.id, datapoint.value_bitmask);
+      ESP_LOGV(TAG, "MCU reported sensor %u is: %" PRIx32, datapoint.id, datapoint.value_bitmask);
       this->publish_state(datapoint.value_bitmask);
     }
   });
diff --git a/esphome/components/vbus/vbus.cpp b/esphome/components/vbus/vbus.cpp
index c9758891cc..e474dcfe17 100644
--- a/esphome/components/vbus/vbus.cpp
+++ b/esphome/components/vbus/vbus.cpp
@@ -1,6 +1,7 @@
 #include "vbus.h"
 #include "esphome/core/helpers.h"
 #include "esphome/core/log.h"
+#include <cinttypes>
 
 namespace esphome {
 namespace vbus {
@@ -64,8 +65,8 @@ void VBus::loop() {
         uint16_t id = (this->buffer_[8] << 8) + this->buffer_[7];
         uint32_t value =
             (this->buffer_[12] << 24) + (this->buffer_[11] << 16) + (this->buffer_[10] << 8) + this->buffer_[9];
-        ESP_LOGV(TAG, "P1 C%04x %04x->%04x: %04x %04x (%d)", this->command_, this->source_, this->dest_, id, value,
-                 value);
+        ESP_LOGV(TAG, "P1 C%04x %04x->%04x: %04x %04" PRIx32 " (%" PRIu32 ")", this->command_, this->source_,
+                 this->dest_, id, value, value);
       } else if ((this->protocol_ == 0x10) && (this->buffer_.size() == 9)) {
         if (!checksum(this->buffer_.data(), 0, 9)) {
           ESP_LOGE(TAG, "P1 checksum failed");
diff --git a/esphome/components/wireguard/wireguard.cpp b/esphome/components/wireguard/wireguard.cpp
index 3cd4409dda..f89a5ebbad 100644
--- a/esphome/components/wireguard/wireguard.cpp
+++ b/esphome/components/wireguard/wireguard.cpp
@@ -2,6 +2,7 @@
 
 #ifdef USE_ESP32
 
+#include <cinttypes>
 #include <ctime>
 #include <functional>
 
@@ -144,7 +145,7 @@ void Wireguard::dump_config() {
   }
   ESP_LOGCONFIG(TAG, "  Peer Persistent Keepalive: %d%s", this->keepalive_,
                 (this->keepalive_ > 0 ? "s" : " (DISABLED)"));
-  ESP_LOGCONFIG(TAG, "  Reboot Timeout: %d%s", (this->reboot_timeout_ / 1000),
+  ESP_LOGCONFIG(TAG, "  Reboot Timeout: %" PRIu32 "%s", (this->reboot_timeout_ / 1000),
                 (this->reboot_timeout_ != 0 ? "s" : " (DISABLED)"));
   // be careful: if proceed_allowed_ is true, require connection is false
   ESP_LOGCONFIG(TAG, "  Require Connection to Proceed: %s", (this->proceed_allowed_ ? "NO" : "YES"));
@@ -287,7 +288,7 @@ void resume_wdt() {
 #if ESP_IDF_VERSION_MAJOR >= 5
   wdtc.timeout_ms = CONFIG_ESP_TASK_WDT_TIMEOUT_S * 1000;
   esp_task_wdt_reconfigure(&wdtc);
-  ESP_LOGV(TAG, "wdt resumed with %d ms timeout", wdtc.timeout_ms);
+  ESP_LOGV(TAG, "wdt resumed with %" PRIu32 " ms timeout", wdtc.timeout_ms);
 #else
   esp_task_wdt_init(CONFIG_ESP_TASK_WDT_TIMEOUT_S, false);
   ESP_LOGV(TAG, "wdt resumed with %d seconds timeout", CONFIG_ESP_TASK_WDT_TIMEOUT_S);

From ff8b9040975ce71dfd8eab7679619fe7859aff19 Mon Sep 17 00:00:00 2001
From: kahrendt <kahrendt@gmail.com>
Date: Sun, 5 Nov 2023 20:19:03 -0500
Subject: [PATCH 112/131] Null topic_prefix disables MQTT
 publishing/subscription unless topic is explicitly configured (#5644)

---
 esphome/components/mqtt/__init__.py        | 60 +++++++++++++---------
 esphome/components/mqtt/mqtt_component.cpp | 33 ++++++++----
 tests/test4.yaml                           | 27 ++++++----
 3 files changed, 77 insertions(+), 43 deletions(-)

diff --git a/esphome/components/mqtt/__init__.py b/esphome/components/mqtt/__init__.py
index 6d0846edad..baf32097fa 100644
--- a/esphome/components/mqtt/__init__.py
+++ b/esphome/components/mqtt/__init__.py
@@ -133,33 +133,47 @@ def validate_config(value):
     # Populate default fields
     out = value.copy()
     topic_prefix = value[CONF_TOPIC_PREFIX]
+    # If the topic prefix is not null and these messages are not configured, then set them to the default
+    # If the topic prefix is null and these messages are not configured, then set them to null
     if CONF_BIRTH_MESSAGE not in value:
-        out[CONF_BIRTH_MESSAGE] = {
-            CONF_TOPIC: f"{topic_prefix}/status",
-            CONF_PAYLOAD: "online",
-            CONF_QOS: 0,
-            CONF_RETAIN: True,
-        }
+        if topic_prefix != "":
+            out[CONF_BIRTH_MESSAGE] = {
+                CONF_TOPIC: f"{topic_prefix}/status",
+                CONF_PAYLOAD: "online",
+                CONF_QOS: 0,
+                CONF_RETAIN: True,
+            }
+        else:
+            out[CONF_BIRTH_MESSAGE] = {}
     if CONF_WILL_MESSAGE not in value:
-        out[CONF_WILL_MESSAGE] = {
-            CONF_TOPIC: f"{topic_prefix}/status",
-            CONF_PAYLOAD: "offline",
-            CONF_QOS: 0,
-            CONF_RETAIN: True,
-        }
+        if topic_prefix != "":
+            out[CONF_WILL_MESSAGE] = {
+                CONF_TOPIC: f"{topic_prefix}/status",
+                CONF_PAYLOAD: "offline",
+                CONF_QOS: 0,
+                CONF_RETAIN: True,
+            }
+        else:
+            out[CONF_WILL_MESSAGE] = {}
     if CONF_SHUTDOWN_MESSAGE not in value:
-        out[CONF_SHUTDOWN_MESSAGE] = {
-            CONF_TOPIC: f"{topic_prefix}/status",
-            CONF_PAYLOAD: "offline",
-            CONF_QOS: 0,
-            CONF_RETAIN: True,
-        }
+        if topic_prefix != "":
+            out[CONF_SHUTDOWN_MESSAGE] = {
+                CONF_TOPIC: f"{topic_prefix}/status",
+                CONF_PAYLOAD: "offline",
+                CONF_QOS: 0,
+                CONF_RETAIN: True,
+            }
+        else:
+            out[CONF_SHUTDOWN_MESSAGE] = {}
     if CONF_LOG_TOPIC not in value:
-        out[CONF_LOG_TOPIC] = {
-            CONF_TOPIC: f"{topic_prefix}/debug",
-            CONF_QOS: 0,
-            CONF_RETAIN: True,
-        }
+        if topic_prefix != "":
+            out[CONF_LOG_TOPIC] = {
+                CONF_TOPIC: f"{topic_prefix}/debug",
+                CONF_QOS: 0,
+                CONF_RETAIN: True,
+            }
+        else:
+            out[CONF_LOG_TOPIC] = {}
     return out
 
 
diff --git a/esphome/components/mqtt/mqtt_component.cpp b/esphome/components/mqtt/mqtt_component.cpp
index 95dc082e84..f9f8c850e9 100644
--- a/esphome/components/mqtt/mqtt_component.cpp
+++ b/esphome/components/mqtt/mqtt_component.cpp
@@ -23,8 +23,13 @@ std::string MQTTComponent::get_discovery_topic_(const MQTTDiscoveryInfo &discove
 }
 
 std::string MQTTComponent::get_default_topic_for_(const std::string &suffix) const {
-  return global_mqtt_client->get_topic_prefix() + "/" + this->component_type() + "/" + this->get_default_object_id_() +
-         "/" + suffix;
+  const std::string &topic_prefix = global_mqtt_client->get_topic_prefix();
+  if (topic_prefix.empty()) {
+    // If the topic_prefix is null, the default topic should be null
+    return "";
+  }
+
+  return topic_prefix + "/" + this->component_type() + "/" + this->get_default_object_id_() + "/" + suffix;
 }
 
 std::string MQTTComponent::get_state_topic_() const {
@@ -245,17 +250,25 @@ std::string MQTTComponent::friendly_name() const { return this->get_entity()->ge
 std::string MQTTComponent::get_icon() const { return this->get_entity()->get_icon(); }
 bool MQTTComponent::is_disabled_by_default() const { return this->get_entity()->is_disabled_by_default(); }
 bool MQTTComponent::is_internal() {
-  if ((this->get_state_topic_().empty()) || (this->get_command_topic_().empty())) {
-    // If both state_topic and command_topic are empty, then the entity is internal to mqtt
+  if (this->has_custom_state_topic_) {
+    // If the custom state_topic is null, return true as it is internal and should not publish
+    // else, return false, as it is explicitly set to a topic, so it is not internal and should publish
+    return this->get_state_topic_().empty();
+  }
+
+  if (this->has_custom_command_topic_) {
+    // If the custom command_topic is null, return true as it is internal and should not publish
+    // else, return false, as it is explicitly set to a topic, so it is not internal and should publish
+    return this->get_command_topic_().empty();
+  }
+
+  // No custom topics have been set
+  if (this->get_default_topic_for_("").empty()) {
+    // If the default topic prefix is null, then the component, by default, is internal and should not publish
     return true;
   }
 
-  if (this->has_custom_state_topic_ || this->has_custom_command_topic_) {
-    // If a custom state_topic or command_topic is set, then the entity is not internal to mqtt
-    return false;
-  }
-
-  // Use ESPHome's entity internal state
+  // Use ESPHome's component internal state if topic_prefix is not null with no custom state_topic or command_topic
   return this->get_entity()->is_internal();
 }
 
diff --git a/tests/test4.yaml b/tests/test4.yaml
index 3d0ed2f658..a5e5b05e8b 100644
--- a/tests/test4.yaml
+++ b/tests/test4.yaml
@@ -24,6 +24,13 @@ ethernet:
 network:
   enable_ipv6: true
 
+mqtt:
+  broker: test.mosquitto.org
+  port: 1883
+  discovery: true
+  discovery_prefix: homeassistant
+  topic_prefix:
+
 api:
 
 i2c:
@@ -32,15 +39,15 @@ i2c:
   scan: false
 
 spi:
-- id: spi_id_1
-  clk_pin: GPIO21
-  mosi_pin: GPIO22
-  miso_pin: GPIO23
-  interface: hardware
-- id: spi_id_2
-  clk_pin: GPIO32
-  mosi_pin: GPIO33
-  interface: hardware
+  - id: spi_id_1
+    clk_pin: GPIO21
+    mosi_pin: GPIO22
+    miso_pin: GPIO23
+    interface: hardware
+  - id: spi_id_2
+    clk_pin: GPIO32
+    mosi_pin: GPIO33
+    interface: hardware
 
 uart:
   - id: uart115200
@@ -281,6 +288,7 @@ sensor:
     id: a01nyub_sensor
     name: "a01nyub Distance"
     uart_id: uart9600
+    state_topic: "esphome/sensor/a01nyub_sensor/state"
 
 #
 # platform sensor.apds9960 requires component apds9960
@@ -764,7 +772,6 @@ speaker:
     i2s_dout_pin: GPIO25
     mode: mono
 
-
 voice_assistant:
   microphone: mic_id_external
   speaker: speaker_id

From d5aeb32ca67e89c07bed3f5191918b3a539ae228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rodrigo=20Mart=C3=ADn?= <contact@rodrigomartin.dev>
Date: Mon, 6 Nov 2023 03:54:39 +0100
Subject: [PATCH 113/131] feat: Add ESP32 BLE enable/disable automations
 (#5616)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   4 +-
 esphome/components/esp32_ble/__init__.py      |  27 ++-
 esphome/components/esp32_ble/ble.cpp          | 162 ++++++++++++++++--
 esphome/components/esp32_ble/ble.h            |  58 ++++++-
 .../components/esp32_ble_server/__init__.py   |   3 +-
 .../esp32_ble_server/ble_characteristic.cpp   |  12 ++
 .../esp32_ble_server/ble_characteristic.h     |   2 +
 .../esp32_ble_server/ble_server.cpp           |  91 ++++++----
 .../components/esp32_ble_server/ble_server.h  |  32 ++--
 .../esp32_ble_server/ble_service.cpp          |  41 ++++-
 .../components/esp32_ble_server/ble_service.h |   9 +-
 .../components/esp32_ble_tracker/__init__.py  |   1 +
 .../esp32_ble_tracker/esp32_ble_tracker.cpp   |  60 +++++--
 .../esp32_ble_tracker/esp32_ble_tracker.h     |   9 +-
 .../esp32_improv/esp32_improv_component.cpp   |  30 ++--
 .../esp32_improv/esp32_improv_component.h     |   2 +-
 tests/test11.5.yaml                           |   7 +
 17 files changed, 446 insertions(+), 104 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index b639088900..a48d0ab2e0 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -89,9 +89,9 @@ esphome/components/ektf2232/* @jesserockz
 esphome/components/emc2101/* @ellull
 esphome/components/ens210/* @itn3rd77
 esphome/components/esp32/* @esphome/core
-esphome/components/esp32_ble/* @jesserockz
+esphome/components/esp32_ble/* @Rapsssito @jesserockz
 esphome/components/esp32_ble_client/* @jesserockz
-esphome/components/esp32_ble_server/* @clydebarrow @jesserockz
+esphome/components/esp32_ble_server/* @Rapsssito @clydebarrow @jesserockz
 esphome/components/esp32_camera_web_server/* @ayufan
 esphome/components/esp32_can/* @Sympatron
 esphome/components/esp32_improv/* @jesserockz
diff --git a/esphome/components/esp32_ble/__init__.py b/esphome/components/esp32_ble/__init__.py
index b4cb595da0..57a7341505 100644
--- a/esphome/components/esp32_ble/__init__.py
+++ b/esphome/components/esp32_ble/__init__.py
@@ -1,15 +1,17 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
+from esphome import automation
 from esphome.const import CONF_ID
 from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
 
 DEPENDENCIES = ["esp32"]
-CODEOWNERS = ["@jesserockz"]
+CODEOWNERS = ["@jesserockz", "@Rapsssito"]
 CONFLICTS_WITH = ["esp32_ble_beacon"]
 
 CONF_BLE_ID = "ble_id"
 CONF_IO_CAPABILITY = "io_capability"
+CONF_ENABLE_ON_BOOT = "enable_on_boot"
 
 NO_BLUETOOTH_VARIANTS = [const.VARIANT_ESP32S2]
 
@@ -20,6 +22,10 @@ GAPEventHandler = esp32_ble_ns.class_("GAPEventHandler")
 GATTcEventHandler = esp32_ble_ns.class_("GATTcEventHandler")
 GATTsEventHandler = esp32_ble_ns.class_("GATTsEventHandler")
 
+BLEEnabledCondition = esp32_ble_ns.class_("BLEEnabledCondition", automation.Condition)
+BLEEnableAction = esp32_ble_ns.class_("BLEEnableAction", automation.Action)
+BLEDisableAction = esp32_ble_ns.class_("BLEDisableAction", automation.Action)
+
 IoCapability = esp32_ble_ns.enum("IoCapability")
 IO_CAPABILITY = {
     "none": IoCapability.IO_CAP_NONE,
@@ -35,6 +41,7 @@ CONFIG_SCHEMA = cv.Schema(
         cv.Optional(CONF_IO_CAPABILITY, default="none"): cv.enum(
             IO_CAPABILITY, lower=True
         ),
+        cv.Optional(CONF_ENABLE_ON_BOOT, default=True): cv.boolean,
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
@@ -50,9 +57,25 @@ FINAL_VALIDATE_SCHEMA = validate_variant
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
+    cg.add(var.set_enable_on_boot(config[CONF_ENABLE_ON_BOOT]))
     cg.add(var.set_io_capability(config[CONF_IO_CAPABILITY]))
+    await cg.register_component(var, config)
 
     if CORE.using_esp_idf:
         add_idf_sdkconfig_option("CONFIG_BT_ENABLED", True)
         add_idf_sdkconfig_option("CONFIG_BT_BLE_42_FEATURES_SUPPORTED", True)
+
+
+@automation.register_condition("ble.enabled", BLEEnabledCondition, cv.Schema({}))
+async def ble_enabled_to_code(config, condition_id, template_arg, args):
+    return cg.new_Pvariable(condition_id, template_arg)
+
+
+@automation.register_action("ble.enable", BLEEnableAction, cv.Schema({}))
+async def ble_enable_to_code(config, action_id, template_arg, args):
+    return cg.new_Pvariable(action_id, template_arg)
+
+
+@automation.register_action("ble.disable", BLEDisableAction, cv.Schema({}))
+async def ble_disable_to_code(config, action_id, template_arg, args):
+    return cg.new_Pvariable(action_id, template_arg)
diff --git a/esphome/components/esp32_ble/ble.cpp b/esphome/components/esp32_ble/ble.cpp
index 6c9124447a..3797f3221e 100644
--- a/esphome/components/esp32_ble/ble.cpp
+++ b/esphome/components/esp32_ble/ble.cpp
@@ -5,8 +5,8 @@
 #include "esphome/core/log.h"
 
 #include <esp_bt.h>
-#include <esp_bt_main.h>
 #include <esp_bt_device.h>
+#include <esp_bt_main.h>
 #include <esp_gap_ble_api.h>
 #include <freertos/FreeRTOS.h>
 #include <freertos/FreeRTOSConfig.h>
@@ -26,30 +26,85 @@ void ESP32BLE::setup() {
   global_ble = this;
   ESP_LOGCONFIG(TAG, "Setting up BLE...");
 
-  if (!ble_setup_()) {
-    ESP_LOGE(TAG, "BLE could not be set up");
+  if (!ble_pre_setup_()) {
+    ESP_LOGE(TAG, "BLE could not be prepared for configuration");
     this->mark_failed();
     return;
   }
 
-#ifdef USE_ESP32_BLE_SERVER
-  this->advertising_ = new BLEAdvertising();  // NOLINT(cppcoreguidelines-owning-memory)
-
-  this->advertising_->set_scan_response(true);
-  this->advertising_->set_min_preferred_interval(0x06);
-  this->advertising_->start();
-#endif  // USE_ESP32_BLE_SERVER
-
-  ESP_LOGD(TAG, "BLE setup complete");
+  this->state_ = BLE_COMPONENT_STATE_DISABLED;
+  if (this->enable_on_boot_) {
+    this->enable();
+  }
 }
 
-bool ESP32BLE::ble_setup_() {
+void ESP32BLE::enable() {
+  if (this->state_ != BLE_COMPONENT_STATE_DISABLED)
+    return;
+
+  this->state_ = BLE_COMPONENT_STATE_ENABLE;
+}
+
+void ESP32BLE::disable() {
+  if (this->state_ == BLE_COMPONENT_STATE_DISABLED)
+    return;
+
+  this->state_ = BLE_COMPONENT_STATE_DISABLE;
+}
+
+bool ESP32BLE::is_active() { return this->state_ == BLE_COMPONENT_STATE_ACTIVE; }
+
+void ESP32BLE::advertising_start() {
+  this->advertising_init_();
+  if (!this->is_active())
+    return;
+  this->advertising_->start();
+}
+
+void ESP32BLE::advertising_set_service_data(const std::vector<uint8_t> &data) {
+  this->advertising_init_();
+  this->advertising_->set_service_data(data);
+  this->advertising_start();
+}
+
+void ESP32BLE::advertising_set_manufacturer_data(const std::vector<uint8_t> &data) {
+  this->advertising_init_();
+  this->advertising_->set_manufacturer_data(data);
+  this->advertising_start();
+}
+
+void ESP32BLE::advertising_add_service_uuid(ESPBTUUID uuid) {
+  this->advertising_init_();
+  this->advertising_->add_service_uuid(uuid);
+  this->advertising_start();
+}
+
+void ESP32BLE::advertising_remove_service_uuid(ESPBTUUID uuid) {
+  this->advertising_init_();
+  this->advertising_->remove_service_uuid(uuid);
+  this->advertising_start();
+}
+
+bool ESP32BLE::ble_pre_setup_() {
   esp_err_t err = nvs_flash_init();
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "nvs_flash_init failed: %d", err);
     return false;
   }
+  return true;
+}
 
+void ESP32BLE::advertising_init_() {
+  if (this->advertising_ != nullptr)
+    return;
+  this->advertising_ = new BLEAdvertising();  // NOLINT(cppcoreguidelines-owning-memory)
+
+  this->advertising_->set_scan_response(true);
+  this->advertising_->set_min_preferred_interval(0x06);
+}
+
+bool ESP32BLE::ble_setup_() {
+  esp_err_t err;
 #ifdef USE_ARDUINO
   if (!btStart()) {
     ESP_LOGE(TAG, "btStart failed: %d", esp_bt_controller_get_status());
@@ -146,7 +201,88 @@ bool ESP32BLE::ble_setup_() {
   return true;
 }
 
+bool ESP32BLE::ble_dismantle_() {
+  esp_err_t err = esp_bluedroid_disable();
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_bluedroid_disable failed: %d", err);
+    return false;
+  }
+  err = esp_bluedroid_deinit();
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_bluedroid_deinit failed: %d", err);
+    return false;
+  }
+
+#ifdef USE_ARDUINO
+  if (!btStop()) {
+    ESP_LOGE(TAG, "btStop failed: %d", esp_bt_controller_get_status());
+    return false;
+  }
+#else
+  if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) {
+    // stop bt controller
+    if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) {
+      err = esp_bt_controller_disable();
+      if (err != ESP_OK) {
+        ESP_LOGE(TAG, "esp_bt_controller_disable failed: %s", esp_err_to_name(err));
+        return false;
+      }
+      while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED)
+        ;
+    }
+    if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED) {
+      err = esp_bt_controller_deinit();
+      if (err != ESP_OK) {
+        ESP_LOGE(TAG, "esp_bt_controller_deinit failed: %s", esp_err_to_name(err));
+        return false;
+      }
+    }
+    if (esp_bt_controller_get_status() != ESP_BT_CONTROLLER_STATUS_IDLE) {
+      ESP_LOGE(TAG, "esp bt controller disable failed");
+      return false;
+    }
+  }
+#endif
+  return true;
+}
+
 void ESP32BLE::loop() {
+  switch (this->state_) {
+    case BLE_COMPONENT_STATE_OFF:
+    case BLE_COMPONENT_STATE_DISABLED:
+      return;
+    case BLE_COMPONENT_STATE_DISABLE: {
+      ESP_LOGD(TAG, "Disabling BLE...");
+
+      for (auto *ble_event_handler : this->ble_status_event_handlers_) {
+        ble_event_handler->ble_before_disabled_event_handler();
+      }
+
+      if (!ble_dismantle_()) {
+        ESP_LOGE(TAG, "BLE could not be dismantled");
+        this->mark_failed();
+        return;
+      }
+      this->state_ = BLE_COMPONENT_STATE_DISABLED;
+      return;
+    }
+    case BLE_COMPONENT_STATE_ENABLE: {
+      ESP_LOGD(TAG, "Enabling BLE...");
+      this->state_ = BLE_COMPONENT_STATE_OFF;
+
+      if (!ble_setup_()) {
+        ESP_LOGE(TAG, "BLE could not be set up");
+        this->mark_failed();
+        return;
+      }
+
+      this->state_ = BLE_COMPONENT_STATE_ACTIVE;
+      return;
+    }
+    case BLE_COMPONENT_STATE_ACTIVE:
+      break;
+  }
+
   BLEEvent *ble_event = this->ble_events_.pop();
   while (ble_event != nullptr) {
     switch (ble_event->type_) {
diff --git a/esphome/components/esp32_ble/ble.h b/esphome/components/esp32_ble/ble.h
index cde17da425..023960d6e4 100644
--- a/esphome/components/esp32_ble/ble.h
+++ b/esphome/components/esp32_ble/ble.h
@@ -1,19 +1,21 @@
 #pragma once
 
 #include "ble_advertising.h"
+#include "ble_uuid.h"
 
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/helpers.h"
 
-#include "queue.h"
 #include "ble_event.h"
+#include "queue.h"
 
 #ifdef USE_ESP32
 
 #include <esp_gap_ble_api.h>
-#include <esp_gatts_api.h>
 #include <esp_gattc_api.h>
+#include <esp_gatts_api.h>
 
 namespace esphome {
 namespace esp32_ble {
@@ -35,6 +37,19 @@ enum IoCapability {
   IO_CAP_KBDISP = ESP_IO_CAP_KBDISP,
 };
 
+enum BLEComponentState {
+  /** Nothing has been initialized yet. */
+  BLE_COMPONENT_STATE_OFF = 0,
+  /** BLE should be disabled on next loop. */
+  BLE_COMPONENT_STATE_DISABLE,
+  /** BLE is disabled. */
+  BLE_COMPONENT_STATE_DISABLED,
+  /** BLE should be enabled on next loop. */
+  BLE_COMPONENT_STATE_ENABLE,
+  /** BLE is active. */
+  BLE_COMPONENT_STATE_ACTIVE,
+};
+
 class GAPEventHandler {
  public:
   virtual void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) = 0;
@@ -52,20 +67,36 @@ class GATTsEventHandler {
                                    esp_ble_gatts_cb_param_t *param) = 0;
 };
 
+class BLEStatusEventHandler {
+ public:
+  virtual void ble_before_disabled_event_handler() = 0;
+};
+
 class ESP32BLE : public Component {
  public:
   void set_io_capability(IoCapability io_capability) { this->io_cap_ = (esp_ble_io_cap_t) io_capability; }
 
+  void enable();
+  void disable();
+  bool is_active();
   void setup() override;
   void loop() override;
   void dump_config() override;
   float get_setup_priority() const override;
 
-  BLEAdvertising *get_advertising() { return this->advertising_; }
+  void advertising_start();
+  void advertising_set_service_data(const std::vector<uint8_t> &data);
+  void advertising_set_manufacturer_data(const std::vector<uint8_t> &data);
+  void advertising_add_service_uuid(ESPBTUUID uuid);
+  void advertising_remove_service_uuid(ESPBTUUID uuid);
 
   void register_gap_event_handler(GAPEventHandler *handler) { this->gap_event_handlers_.push_back(handler); }
   void register_gattc_event_handler(GATTcEventHandler *handler) { this->gattc_event_handlers_.push_back(handler); }
   void register_gatts_event_handler(GATTsEventHandler *handler) { this->gatts_event_handlers_.push_back(handler); }
+  void register_ble_status_event_handler(BLEStatusEventHandler *handler) {
+    this->ble_status_event_handlers_.push_back(handler);
+  }
+  void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }
 
  protected:
   static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
@@ -77,19 +108,40 @@ class ESP32BLE : public Component {
   void real_gap_event_handler_(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
 
   bool ble_setup_();
+  bool ble_dismantle_();
+  bool ble_pre_setup_();
+  void advertising_init_();
 
   std::vector<GAPEventHandler *> gap_event_handlers_;
   std::vector<GATTcEventHandler *> gattc_event_handlers_;
   std::vector<GATTsEventHandler *> gatts_event_handlers_;
+  std::vector<BLEStatusEventHandler *> ble_status_event_handlers_;
+  BLEComponentState state_{BLE_COMPONENT_STATE_OFF};
 
   Queue<BLEEvent> ble_events_;
   BLEAdvertising *advertising_;
   esp_ble_io_cap_t io_cap_{ESP_IO_CAP_NONE};
+  bool enable_on_boot_;
 };
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 extern ESP32BLE *global_ble;
 
+template<typename... Ts> class BLEEnabledCondition : public Condition<Ts...> {
+ public:
+  bool check(Ts... x) override { return global_ble->is_active(); }
+};
+
+template<typename... Ts> class BLEEnableAction : public Action<Ts...> {
+ public:
+  void play(Ts... x) override { global_ble->enable(); }
+};
+
+template<typename... Ts> class BLEDisableAction : public Action<Ts...> {
+ public:
+  void play(Ts... x) override { global_ble->disable(); }
+};
+
 }  // namespace esp32_ble
 }  // namespace esphome
 
diff --git a/esphome/components/esp32_ble_server/__init__.py b/esphome/components/esp32_ble_server/__init__.py
index 5e1ad71501..f53c9450f4 100644
--- a/esphome/components/esp32_ble_server/__init__.py
+++ b/esphome/components/esp32_ble_server/__init__.py
@@ -6,7 +6,7 @@ from esphome.core import CORE
 from esphome.components.esp32 import add_idf_sdkconfig_option
 
 AUTO_LOAD = ["esp32_ble"]
-CODEOWNERS = ["@jesserockz", "@clydebarrow"]
+CODEOWNERS = ["@jesserockz", "@clydebarrow", "@Rapsssito"]
 CONFLICTS_WITH = ["esp32_ble_beacon"]
 DEPENDENCIES = ["esp32"]
 
@@ -41,6 +41,7 @@ async def to_code(config):
 
     parent = await cg.get_variable(config[esp32_ble.CONF_BLE_ID])
     cg.add(parent.register_gatts_event_handler(var))
+    cg.add(parent.register_ble_status_event_handler(var))
     cg.add(var.set_parent(parent))
 
     cg.add(var.set_manufacturer(config[CONF_MANUFACTURER]))
diff --git a/esphome/components/esp32_ble_server/ble_characteristic.cpp b/esphome/components/esp32_ble_server/ble_characteristic.cpp
index 15a51f6ede..6ff7d615f9 100644
--- a/esphome/components/esp32_ble_server/ble_characteristic.cpp
+++ b/esphome/components/esp32_ble_server/ble_characteristic.cpp
@@ -11,6 +11,13 @@ namespace esp32_ble_server {
 
 static const char *const TAG = "esp32_ble_server.characteristic";
 
+BLECharacteristic::~BLECharacteristic() {
+  for (auto *descriptor : this->descriptors_) {
+    delete descriptor;  // NOLINT(cppcoreguidelines-owning-memory)
+  }
+  vSemaphoreDelete(this->set_value_lock_);
+}
+
 BLECharacteristic::BLECharacteristic(const ESPBTUUID uuid, uint32_t properties) : uuid_(uuid) {
   this->set_value_lock_ = xSemaphoreCreateBinary();
   xSemaphoreGive(this->set_value_lock_);
@@ -98,6 +105,11 @@ void BLECharacteristic::notify(bool notification) {
 
 void BLECharacteristic::add_descriptor(BLEDescriptor *descriptor) { this->descriptors_.push_back(descriptor); }
 
+void BLECharacteristic::remove_descriptor(BLEDescriptor *descriptor) {
+  this->descriptors_.erase(std::remove(this->descriptors_.begin(), this->descriptors_.end(), descriptor),
+                           this->descriptors_.end());
+}
+
 void BLECharacteristic::do_create(BLEService *service) {
   this->service_ = service;
   esp_attr_control_t control;
diff --git a/esphome/components/esp32_ble_server/ble_characteristic.h b/esphome/components/esp32_ble_server/ble_characteristic.h
index d7af3a934a..8837c796a5 100644
--- a/esphome/components/esp32_ble_server/ble_characteristic.h
+++ b/esphome/components/esp32_ble_server/ble_characteristic.h
@@ -25,6 +25,7 @@ class BLEService;
 class BLECharacteristic {
  public:
   BLECharacteristic(ESPBTUUID uuid, uint32_t properties);
+  ~BLECharacteristic();
 
   void set_value(const uint8_t *data, size_t length);
   void set_value(std::vector<uint8_t> value);
@@ -52,6 +53,7 @@ class BLECharacteristic {
   void on_write(const std::function<void(const std::vector<uint8_t> &)> &&func) { this->on_write_ = func; }
 
   void add_descriptor(BLEDescriptor *descriptor);
+  void remove_descriptor(BLEDescriptor *descriptor);
 
   BLEService *get_service() { return this->service_; }
   ESPBTUUID get_uuid() { return this->uuid_; }
diff --git a/esphome/components/esp32_ble_server/ble_server.cpp b/esphome/components/esp32_ble_server/ble_server.cpp
index ca244aba95..338413f64e 100644
--- a/esphome/components/esp32_ble_server/ble_server.cpp
+++ b/esphome/components/esp32_ble_server/ble_server.cpp
@@ -30,13 +30,13 @@ void BLEServer::setup() {
     ESP_LOGE(TAG, "BLE Server was marked failed by ESP32BLE");
     return;
   }
-
-  ESP_LOGD(TAG, "Setting up BLE Server...");
-
   global_ble_server = this;
 }
 
 void BLEServer::loop() {
+  if (!this->parent_->is_active()) {
+    return;
+  }
   switch (this->state_) {
     case RUNNING:
       return;
@@ -53,10 +53,16 @@ void BLEServer::loop() {
     }
     case REGISTERING: {
       if (this->registered_) {
-        this->device_information_service_ = this->create_service(DEVICE_INFORMATION_SERVICE_UUID);
-
-        this->create_device_characteristics_();
-
+        // Create all services previously created
+        for (auto &pair : this->services_) {
+          pair.second->do_create(this);
+        }
+        if (this->device_information_service_ == nullptr) {
+          this->create_service(ESPBTUUID::from_uint16(DEVICE_INFORMATION_SERVICE_UUID));
+          this->device_information_service_ =
+              this->get_service(ESPBTUUID::from_uint16(DEVICE_INFORMATION_SERVICE_UUID));
+          this->create_device_characteristics_();
+        }
         this->state_ = STARTING_SERVICE;
       }
       break;
@@ -67,7 +73,6 @@ void BLEServer::loop() {
       }
       if (this->device_information_service_->is_running()) {
         this->state_ = RUNNING;
-        this->can_proceed_ = true;
         this->restart_advertising_();
         ESP_LOGD(TAG, "BLE server setup successfully");
       } else if (!this->device_information_service_->is_starting()) {
@@ -78,10 +83,13 @@ void BLEServer::loop() {
   }
 }
 
+bool BLEServer::is_running() { return this->parent_->is_active() && this->state_ == RUNNING; }
+
+bool BLEServer::can_proceed() { return this->is_running() || !this->parent_->is_active(); }
+
 void BLEServer::restart_advertising_() {
-  if (this->state_ == RUNNING) {
-    esp32_ble::global_ble->get_advertising()->set_manufacturer_data(this->manufacturer_data_);
-    esp32_ble::global_ble->get_advertising()->start();
+  if (this->is_running()) {
+    this->parent_->advertising_set_manufacturer_data(this->manufacturer_data_);
   }
 }
 
@@ -107,24 +115,36 @@ bool BLEServer::create_device_characteristics_() {
   return true;
 }
 
-std::shared_ptr<BLEService> BLEServer::create_service(const uint8_t *uuid, bool advertise) {
-  return this->create_service(ESPBTUUID::from_raw(uuid), advertise);
-}
-std::shared_ptr<BLEService> BLEServer::create_service(uint16_t uuid, bool advertise) {
-  return this->create_service(ESPBTUUID::from_uint16(uuid), advertise);
-}
-std::shared_ptr<BLEService> BLEServer::create_service(const std::string &uuid, bool advertise) {
-  return this->create_service(ESPBTUUID::from_raw(uuid), advertise);
-}
-std::shared_ptr<BLEService> BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t num_handles,
-                                                      uint8_t inst_id) {
-  ESP_LOGV(TAG, "Creating service - %s", uuid.to_string().c_str());
-  std::shared_ptr<BLEService> service = std::make_shared<BLEService>(uuid, num_handles, inst_id);
-  this->services_.emplace_back(service);
-  if (advertise) {
-    esp32_ble::global_ble->get_advertising()->add_service_uuid(uuid);
+void BLEServer::create_service(ESPBTUUID uuid, bool advertise, uint16_t num_handles, uint8_t inst_id) {
+  ESP_LOGV(TAG, "Creating BLE service - %s", uuid.to_string().c_str());
+  // If the service already exists, do nothing
+  BLEService *service = this->get_service(uuid);
+  if (service != nullptr) {
+    ESP_LOGW(TAG, "BLE service %s already exists", uuid.to_string().c_str());
+    return;
   }
+  service = new BLEService(uuid, num_handles, inst_id, advertise);  // NOLINT(cppcoreguidelines-owning-memory)
+  this->services_.emplace(uuid.to_string(), service);
   service->do_create(this);
+}
+
+void BLEServer::remove_service(ESPBTUUID uuid) {
+  ESP_LOGV(TAG, "Removing BLE service - %s", uuid.to_string().c_str());
+  BLEService *service = this->get_service(uuid);
+  if (service == nullptr) {
+    ESP_LOGW(TAG, "BLE service %s not found", uuid.to_string().c_str());
+    return;
+  }
+  service->do_delete();
+  delete service;  // NOLINT(cppcoreguidelines-owning-memory)
+  this->services_.erase(uuid.to_string());
+}
+
+BLEService *BLEServer::get_service(ESPBTUUID uuid) {
+  BLEService *service = nullptr;
+  if (this->services_.count(uuid.to_string()) > 0) {
+    service = this->services_.at(uuid.to_string());
+  }
   return service;
 }
 
@@ -144,7 +164,7 @@ void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
       ESP_LOGD(TAG, "BLE Client disconnected");
       if (this->remove_client_(param->disconnect.conn_id))
         this->connected_clients_--;
-      esp32_ble::global_ble->get_advertising()->start();
+      this->parent_->advertising_start();
       for (auto *component : this->service_components_) {
         component->on_client_disconnect();
       }
@@ -159,11 +179,22 @@ void BLEServer::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t ga
       break;
   }
 
-  for (const auto &service : this->services_) {
-    service->gatts_event_handler(event, gatts_if, param);
+  for (const auto &pair : this->services_) {
+    pair.second->gatts_event_handler(event, gatts_if, param);
   }
 }
 
+void BLEServer::ble_before_disabled_event_handler() {
+  // Delete all clients
+  this->clients_.clear();
+  // Delete all services
+  for (auto &pair : this->services_) {
+    pair.second->do_delete();
+  }
+  this->registered_ = false;
+  this->state_ = INIT;
+}
+
 float BLEServer::get_setup_priority() const { return setup_priority::AFTER_BLUETOOTH + 10; }
 
 void BLEServer::dump_config() { ESP_LOGCONFIG(TAG, "ESP32 BLE Server:"); }
diff --git a/esphome/components/esp32_ble_server/ble_server.h b/esphome/components/esp32_ble_server/ble_server.h
index 14c88be1a2..e379e67296 100644
--- a/esphome/components/esp32_ble_server/ble_server.h
+++ b/esphome/components/esp32_ble_server/ble_server.h
@@ -11,9 +11,9 @@
 #include "esphome/core/helpers.h"
 #include "esphome/core/preferences.h"
 
-#include <map>
 #include <memory>
 #include <vector>
+#include <unordered_map>
 
 #ifdef USE_ESP32
 
@@ -33,15 +33,16 @@ class BLEServiceComponent {
   virtual void stop();
 };
 
-class BLEServer : public Component, public GATTsEventHandler, public Parented<ESP32BLE> {
+class BLEServer : public Component, public GATTsEventHandler, public BLEStatusEventHandler, public Parented<ESP32BLE> {
  public:
   void setup() override;
   void loop() override;
   void dump_config() override;
   float get_setup_priority() const override;
-  bool can_proceed() override { return this->can_proceed_; }
+  bool can_proceed() override;
 
   void teardown();
+  bool is_running();
 
   void set_manufacturer(const std::string &manufacturer) { this->manufacturer_ = manufacturer; }
   void set_model(const std::string &model) { this->model_ = model; }
@@ -50,32 +51,28 @@ class BLEServer : public Component, public GATTsEventHandler, public Parented<ES
     this->restart_advertising_();
   }
 
-  std::shared_ptr<BLEService> create_service(const uint8_t *uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(uint16_t uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(const std::string &uuid, bool advertise = false);
-  std::shared_ptr<BLEService> create_service(ESPBTUUID uuid, bool advertise = false, uint16_t num_handles = 15,
-                                             uint8_t inst_id = 0);
+  void create_service(ESPBTUUID uuid, bool advertise = false, uint16_t num_handles = 15, uint8_t inst_id = 0);
+  void remove_service(ESPBTUUID uuid);
+  BLEService *get_service(ESPBTUUID uuid);
 
   esp_gatt_if_t get_gatts_if() { return this->gatts_if_; }
   uint32_t get_connected_client_count() { return this->connected_clients_; }
-  const std::map<uint16_t, void *> &get_clients() { return this->clients_; }
+  const std::unordered_map<uint16_t, void *> &get_clients() { return this->clients_; }
 
   void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if,
                            esp_ble_gatts_cb_param_t *param) override;
 
+  void ble_before_disabled_event_handler() override;
+
   void register_service_component(BLEServiceComponent *component) { this->service_components_.push_back(component); }
 
  protected:
   bool create_device_characteristics_();
   void restart_advertising_();
 
-  void add_client_(uint16_t conn_id, void *client) {
-    this->clients_.insert(std::pair<uint16_t, void *>(conn_id, client));
-  }
+  void add_client_(uint16_t conn_id, void *client) { this->clients_.emplace(conn_id, client); }
   bool remove_client_(uint16_t conn_id) { return this->clients_.erase(conn_id) > 0; }
 
-  bool can_proceed_{false};
-
   std::string manufacturer_;
   optional<std::string> model_;
   std::vector<uint8_t> manufacturer_data_;
@@ -83,10 +80,9 @@ class BLEServer : public Component, public GATTsEventHandler, public Parented<ES
   bool registered_{false};
 
   uint32_t connected_clients_{0};
-  std::map<uint16_t, void *> clients_;
-
-  std::vector<std::shared_ptr<BLEService>> services_;
-  std::shared_ptr<BLEService> device_information_service_;
+  std::unordered_map<uint16_t, void *> clients_;
+  std::unordered_map<std::string, BLEService *> services_;
+  BLEService *device_information_service_;
 
   std::vector<BLEServiceComponent *> service_components_;
 
diff --git a/esphome/components/esp32_ble_server/ble_service.cpp b/esphome/components/esp32_ble_server/ble_service.cpp
index e5aaebc137..368f03fb52 100644
--- a/esphome/components/esp32_ble_server/ble_service.cpp
+++ b/esphome/components/esp32_ble_server/ble_service.cpp
@@ -9,8 +9,8 @@ namespace esp32_ble_server {
 
 static const char *const TAG = "esp32_ble_server.service";
 
-BLEService::BLEService(ESPBTUUID uuid, uint16_t num_handles, uint8_t inst_id)
-    : uuid_(uuid), num_handles_(num_handles), inst_id_(inst_id) {}
+BLEService::BLEService(ESPBTUUID uuid, uint16_t num_handles, uint8_t inst_id, bool advertise)
+    : uuid_(uuid), num_handles_(num_handles), inst_id_(inst_id), advertise_(advertise) {}
 
 BLEService::~BLEService() {
   for (auto &chr : this->characteristics_)
@@ -58,6 +58,20 @@ void BLEService::do_create(BLEServer *server) {
   this->init_state_ = CREATING;
 }
 
+void BLEService::do_delete() {
+  if (this->init_state_ == DELETING || this->init_state_ == DELETED)
+    return;
+  this->init_state_ = DELETING;
+  this->created_characteristic_count_ = 0;
+  this->last_created_characteristic_ = nullptr;
+  this->stop_();
+  esp_err_t err = esp_ble_gatts_delete_service(this->handle_);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_ble_gatts_delete_service failed: %d", err);
+    return;
+  }
+}
+
 bool BLEService::do_create_characteristics_() {
   if (this->created_characteristic_count_ >= this->characteristics_.size() &&
       (this->last_created_characteristic_ == nullptr || this->last_created_characteristic_->is_created()))
@@ -75,24 +89,34 @@ bool BLEService::do_create_characteristics_() {
 void BLEService::start() {
   if (this->do_create_characteristics_())
     return;
+  should_start_ = true;
 
   esp_err_t err = esp_ble_gatts_start_service(this->handle_);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gatts_start_service failed: %d", err);
     return;
   }
+  if (this->advertise_)
+    esp32_ble::global_ble->advertising_add_service_uuid(this->uuid_);
   this->running_state_ = STARTING;
 }
 
 void BLEService::stop() {
+  should_start_ = false;
+  this->stop_();
+}
+
+void BLEService::stop_() {
+  if (this->running_state_ == STOPPING || this->running_state_ == STOPPED)
+    return;
+  this->running_state_ = STOPPING;
   esp_err_t err = esp_ble_gatts_stop_service(this->handle_);
   if (err != ESP_OK) {
     ESP_LOGE(TAG, "esp_ble_gatts_stop_service failed: %d", err);
     return;
   }
-  esp32_ble::global_ble->get_advertising()->remove_service_uuid(this->uuid_);
-  esp32_ble::global_ble->get_advertising()->start();
-  this->running_state_ = STOPPING;
+  if (this->advertise_)
+    esp32_ble::global_ble->advertising_remove_service_uuid(this->uuid_);
 }
 
 bool BLEService::is_created() { return this->init_state_ == CREATED; }
@@ -116,9 +140,16 @@ void BLEService::gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t g
           this->inst_id_ == param->create.service_id.id.inst_id) {
         this->handle_ = param->create.service_handle;
         this->init_state_ = CREATED;
+        if (this->should_start_)
+          this->start();
       }
       break;
     }
+    case ESP_GATTS_DELETE_EVT:
+      if (param->del.service_handle == this->handle_) {
+        this->init_state_ = DELETED;
+      }
+      break;
     case ESP_GATTS_START_EVT: {
       if (param->start.service_handle == this->handle_) {
         this->running_state_ = RUNNING;
diff --git a/esphome/components/esp32_ble_server/ble_service.h b/esphome/components/esp32_ble_server/ble_service.h
index 93b4217517..5e5883b6bf 100644
--- a/esphome/components/esp32_ble_server/ble_service.h
+++ b/esphome/components/esp32_ble_server/ble_service.h
@@ -22,7 +22,7 @@ using namespace esp32_ble;
 
 class BLEService {
  public:
-  BLEService(ESPBTUUID uuid, uint16_t num_handles, uint8_t inst_id);
+  BLEService(ESPBTUUID uuid, uint16_t num_handles, uint8_t inst_id, bool advertise);
   ~BLEService();
   BLECharacteristic *get_characteristic(ESPBTUUID uuid);
   BLECharacteristic *get_characteristic(uint16_t uuid);
@@ -38,6 +38,7 @@ class BLEService {
   BLEServer *get_server() { return this->server_; }
 
   void do_create(BLEServer *server);
+  void do_delete();
   void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param);
 
   void start();
@@ -48,6 +49,7 @@ class BLEService {
 
   bool is_running() { return this->running_state_ == RUNNING; }
   bool is_starting() { return this->running_state_ == STARTING; }
+  bool is_deleted() { return this->init_state_ == DELETED; }
 
  protected:
   std::vector<BLECharacteristic *> characteristics_;
@@ -58,8 +60,11 @@ class BLEService {
   uint16_t num_handles_;
   uint16_t handle_{0xFFFF};
   uint8_t inst_id_;
+  bool advertise_{false};
+  bool should_start_{false};
 
   bool do_create_characteristics_();
+  void stop_();
 
   enum InitState : uint8_t {
     FAILED = 0x00,
@@ -67,6 +72,8 @@ class BLEService {
     CREATING,
     CREATING_DEPENDENTS,
     CREATED,
+    DELETING,
+    DELETED,
   } init_state_{INIT};
 
   enum RunningState : uint8_t {
diff --git a/esphome/components/esp32_ble_tracker/__init__.py b/esphome/components/esp32_ble_tracker/__init__.py
index 8ba77c7db7..2ead59c025 100644
--- a/esphome/components/esp32_ble_tracker/__init__.py
+++ b/esphome/components/esp32_ble_tracker/__init__.py
@@ -212,6 +212,7 @@ async def to_code(config):
     parent = await cg.get_variable(config[esp32_ble.CONF_BLE_ID])
     cg.add(parent.register_gap_event_handler(var))
     cg.add(parent.register_gattc_event_handler(var))
+    cg.add(parent.register_ble_status_event_handler(var))
     cg.add(var.set_parent(parent))
 
     params = config[CONF_SCAN_PARAMETERS]
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
index f67f29477d..a5bbd85b47 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.cpp
@@ -64,17 +64,19 @@ void ESP32BLETracker::setup() {
     }
   });
 #endif
-
-  if (this->scan_continuous_) {
-    if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
-      this->start_scan_(true);
-    } else {
-      ESP_LOGW(TAG, "Cannot start scan!");
-    }
-  }
 }
 
 void ESP32BLETracker::loop() {
+  if (!this->parent_->is_active()) {
+    this->ble_was_disabled_ = true;
+    return;
+  } else if (this->ble_was_disabled_) {
+    this->ble_was_disabled_ = false;
+    // If the BLE stack was disabled, we need to start the scan again.
+    if (this->scan_continuous_) {
+      this->start_scan();
+    }
+  }
   int connecting = 0;
   int discovered = 0;
   int searching = 0;
@@ -182,8 +184,7 @@ void ESP32BLETracker::loop() {
         xSemaphoreGive(this->scan_end_lock_);
       } else {
         ESP_LOGD(TAG, "Stopping scan after failure...");
-        esp_ble_gap_stop_scanning();
-        this->cancel_timeout("scan");
+        this->stop_scan_();
       }
       if (this->scan_start_failed_) {
         ESP_LOGE(TAG, "Scan start failed: %d", this->scan_start_failed_);
@@ -212,8 +213,7 @@ void ESP32BLETracker::loop() {
           client->set_state(ClientState::READY_TO_CONNECT);
         } else {
           ESP_LOGD(TAG, "Pausing scan to make connection...");
-          esp_ble_gap_stop_scanning();
-          this->cancel_timeout("scan");
+          this->stop_scan_();
         }
         break;
       }
@@ -232,11 +232,31 @@ void ESP32BLETracker::start_scan() {
 void ESP32BLETracker::stop_scan() {
   ESP_LOGD(TAG, "Stopping scan.");
   this->scan_continuous_ = false;
-  esp_ble_gap_stop_scanning();
+  this->stop_scan_();
+}
+
+void ESP32BLETracker::ble_before_disabled_event_handler() {
+  this->stop_scan_();
+  xSemaphoreGive(this->scan_end_lock_);
+}
+
+void ESP32BLETracker::stop_scan_() {
   this->cancel_timeout("scan");
+  if (this->scanner_idle_) {
+    return;
+  }
+  esp_err_t err = esp_ble_gap_stop_scanning();
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_ble_gap_stop_scanning failed: %d", err);
+    return;
+  }
 }
 
 void ESP32BLETracker::start_scan_(bool first) {
+  if (!this->parent_->is_active()) {
+    ESP_LOGW(TAG, "Cannot start scan while ESP32BLE is disabled.");
+    return;
+  }
   // The lock must be held when calling this function.
   if (xSemaphoreTake(this->scan_end_lock_, 0L)) {
     ESP_LOGE(TAG, "start_scan called without holding scan_end_lock_");
@@ -249,15 +269,23 @@ void ESP32BLETracker::start_scan_(bool first) {
       listener->on_scan_end();
   }
   this->already_discovered_.clear();
-  this->scanner_idle_ = false;
   this->scan_params_.scan_type = this->scan_active_ ? BLE_SCAN_TYPE_ACTIVE : BLE_SCAN_TYPE_PASSIVE;
   this->scan_params_.own_addr_type = BLE_ADDR_TYPE_PUBLIC;
   this->scan_params_.scan_filter_policy = BLE_SCAN_FILTER_ALLOW_ALL;
   this->scan_params_.scan_interval = this->scan_interval_;
   this->scan_params_.scan_window = this->scan_window_;
 
-  esp_ble_gap_set_scan_params(&this->scan_params_);
-  esp_ble_gap_start_scanning(this->scan_duration_);
+  esp_err_t err = esp_ble_gap_set_scan_params(&this->scan_params_);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_ble_gap_set_scan_params failed: %d", err);
+    return;
+  }
+  err = esp_ble_gap_start_scanning(this->scan_duration_);
+  if (err != ESP_OK) {
+    ESP_LOGE(TAG, "esp_ble_gap_start_scanning failed: %d", err);
+    return;
+  }
+  this->scanner_idle_ = false;
 
   this->set_timeout("scan", this->scan_duration_ * 2000, []() {
     ESP_LOGE(TAG, "ESP-IDF BLE scan never terminated, rebooting to restore BLE stack...");
diff --git a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
index 6efdded3ff..0d986804ce 100644
--- a/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
+++ b/esphome/components/esp32_ble_tracker/esp32_ble_tracker.h
@@ -177,7 +177,11 @@ class ESPBTClient : public ESPBTDeviceListener {
   ClientState state_;
 };
 
-class ESP32BLETracker : public Component, public GAPEventHandler, public GATTcEventHandler, public Parented<ESP32BLE> {
+class ESP32BLETracker : public Component,
+                        public GAPEventHandler,
+                        public GATTcEventHandler,
+                        public BLEStatusEventHandler,
+                        public Parented<ESP32BLE> {
  public:
   void set_scan_duration(uint32_t scan_duration) { scan_duration_ = scan_duration; }
   void set_scan_interval(uint32_t scan_interval) { scan_interval_ = scan_interval; }
@@ -204,8 +208,10 @@ class ESP32BLETracker : public Component, public GAPEventHandler, public GATTcEv
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
   void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) override;
+  void ble_before_disabled_event_handler() override;
 
  protected:
+  void stop_scan_();
   /// Start a single scan by setting up the parameters and doing some esp-idf calls.
   void start_scan_(bool first);
   /// Called when a scan ends
@@ -236,6 +242,7 @@ class ESP32BLETracker : public Component, public GAPEventHandler, public GATTcEv
   bool scan_continuous_;
   bool scan_active_;
   bool scanner_idle_;
+  bool ble_was_disabled_{true};
   bool raw_advertisements_{false};
   bool parse_advertisements_{false};
   SemaphoreHandle_t scan_result_lock_;
diff --git a/esphome/components/esp32_improv/esp32_improv_component.cpp b/esphome/components/esp32_improv/esp32_improv_component.cpp
index 19340c3dd8..90e69e1cfa 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.cpp
+++ b/esphome/components/esp32_improv/esp32_improv_component.cpp
@@ -16,9 +16,6 @@ static const char *const ESPHOME_MY_LINK = "https://my.home-assistant.io/redirec
 ESP32ImprovComponent::ESP32ImprovComponent() { global_improv_component = this; }
 
 void ESP32ImprovComponent::setup() {
-  this->service_ = global_ble_server->create_service(improv::SERVICE_UUID, true);
-  this->setup_characteristics();
-
 #ifdef USE_BINARY_SENSOR
   if (this->authorizer_ != nullptr) {
     this->authorizer_->add_on_state_callback([this](bool state) {
@@ -70,6 +67,19 @@ void ESP32ImprovComponent::setup_characteristics() {
 }
 
 void ESP32ImprovComponent::loop() {
+  if (!global_ble_server->is_running()) {
+    this->state_ = improv::STATE_STOPPED;
+    this->incoming_data_.clear();
+    return;
+  }
+  if (this->service_ == nullptr) {
+    // Setup the service
+    ESP_LOGD(TAG, "Creating Improv service");
+    global_ble_server->create_service(ESPBTUUID::from_raw(improv::SERVICE_UUID), true);
+    this->service_ = global_ble_server->get_service(ESPBTUUID::from_raw(improv::SERVICE_UUID));
+    this->setup_characteristics();
+  }
+
   if (!this->incoming_data_.empty())
     this->process_incoming_data_();
   uint32_t now = millis();
@@ -80,11 +90,10 @@ void ESP32ImprovComponent::loop() {
 
       if (this->service_->is_created() && this->should_start_ && this->setup_complete_) {
         if (this->service_->is_running()) {
-          esp32_ble::global_ble->get_advertising()->start();
+          esp32_ble::global_ble->advertising_start();
 
           this->set_state_(improv::STATE_AWAITING_AUTHORIZATION);
           this->set_error_(improv::ERROR_NONE);
-          this->should_start_ = false;
           ESP_LOGD(TAG, "Service started!");
         } else {
           this->service_->start();
@@ -138,10 +147,7 @@ void ESP32ImprovComponent::loop() {
 #endif
         std::vector<uint8_t> data = improv::build_rpc_response(improv::WIFI_SETTINGS, urls);
         this->send_response_(data);
-        this->set_timeout("end-service", 1000, [this] {
-          this->service_->stop();
-          this->set_state_(improv::STATE_STOPPED);
-        });
+        this->stop();
       }
       break;
     }
@@ -206,8 +212,7 @@ void ESP32ImprovComponent::set_state_(improv::State state) {
   service_data[6] = 0x00;  // Reserved
   service_data[7] = 0x00;  // Reserved
 
-  esp32_ble::global_ble->get_advertising()->set_service_data(service_data);
-  esp32_ble::global_ble->get_advertising()->start();
+  esp32_ble::global_ble->advertising_set_service_data(service_data);
 }
 
 void ESP32ImprovComponent::set_error_(improv::Error error) {
@@ -237,7 +242,10 @@ void ESP32ImprovComponent::start() {
 }
 
 void ESP32ImprovComponent::stop() {
+  this->should_start_ = false;
   this->set_timeout("end-service", 1000, [this] {
+    if (this->state_ == improv::STATE_STOPPED || this->service_ == nullptr)
+      return;
     this->service_->stop();
     this->set_state_(improv::STATE_STOPPED);
   });
diff --git a/esphome/components/esp32_improv/esp32_improv_component.h b/esphome/components/esp32_improv/esp32_improv_component.h
index 00c6cf885a..3ed377a6ad 100644
--- a/esphome/components/esp32_improv/esp32_improv_component.h
+++ b/esphome/components/esp32_improv/esp32_improv_component.h
@@ -68,7 +68,7 @@ class ESP32ImprovComponent : public Component, public BLEServiceComponent {
   std::vector<uint8_t> incoming_data_;
   wifi::WiFiAP connecting_sta_;
 
-  std::shared_ptr<BLEService> service_;
+  BLEService *service_ = nullptr;
   BLECharacteristic *status_;
   BLECharacteristic *error_;
   BLECharacteristic *rpc_;
diff --git a/tests/test11.5.yaml b/tests/test11.5.yaml
index 06985611e7..9b25b9f273 100644
--- a/tests/test11.5.yaml
+++ b/tests/test11.5.yaml
@@ -104,6 +104,12 @@ binary_sensor:
     on_release:
       then:
         - switch.turn_off: Led0
+        - if:
+            condition: ble.enabled
+            then:
+              - ble.disable:
+            else:
+              - ble.enable:
 
   - platform: tm1638
     id: Button1
@@ -273,6 +279,7 @@ output:
 demo:
 
 esp32_ble:
+  enable_on_boot: false
 
 esp32_ble_server:
   manufacturer: ESPHome

From 84bbf02bde3cd9ef7ec24a97e8d372feb60463ec Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 6 Nov 2023 16:41:45 +1300
Subject: [PATCH 114/131] ble_client rssi sensor fix when not connected (#5632)

---
 .../ble_client/sensor/ble_rssi_sensor.cpp          | 14 +++++++++++---
 .../components/ble_client/sensor/ble_rssi_sensor.h |  6 +++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp b/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
index 13e51ed5b3..a36e191e32 100644
--- a/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
+++ b/esphome/components/ble_client/sensor/ble_rssi_sensor.cpp
@@ -1,8 +1,8 @@
 #include "ble_rssi_sensor.h"
-#include "esphome/core/log.h"
+#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/core/application.h"
 #include "esphome/core/helpers.h"
-#include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
+#include "esphome/core/log.h"
 
 #ifdef USE_ESP32
 
@@ -37,6 +37,10 @@ void BLEClientRSSISensor::gattc_event_handler(esp_gattc_cb_event_t event, esp_ga
     }
     case ESP_GATTC_SEARCH_CMPL_EVT:
       this->node_state = espbt::ClientState::ESTABLISHED;
+      if (this->should_update_) {
+        this->should_update_ = false;
+        this->get_rssi_();
+      }
       break;
     default:
       break;
@@ -50,6 +54,7 @@ void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl
       if (param->read_rssi_cmpl.status == ESP_BT_STATUS_SUCCESS) {
         int8_t rssi = param->read_rssi_cmpl.rssi;
         ESP_LOGI(TAG, "ESP_GAP_BLE_READ_RSSI_COMPLETE_EVT RSSI: %d", rssi);
+        this->status_clear_warning();
         this->publish_state(rssi);
       }
       break;
@@ -61,9 +66,12 @@ void BLEClientRSSISensor::gap_event_handler(esp_gap_ble_cb_event_t event, esp_bl
 void BLEClientRSSISensor::update() {
   if (this->node_state != espbt::ClientState::ESTABLISHED) {
     ESP_LOGW(TAG, "[%s] Cannot poll, not connected", this->get_name().c_str());
+    this->should_update_ = true;
     return;
   }
-
+  this->get_rssi_();
+}
+void BLEClientRSSISensor::get_rssi_() {
   ESP_LOGV(TAG, "requesting rssi from %s", this->parent()->address_str().c_str());
   auto status = esp_ble_gap_read_rssi(this->parent()->get_remote_bda());
   if (status != ESP_OK) {
diff --git a/esphome/components/ble_client/sensor/ble_rssi_sensor.h b/esphome/components/ble_client/sensor/ble_rssi_sensor.h
index 028df83832..5dd3fc7af9 100644
--- a/esphome/components/ble_client/sensor/ble_rssi_sensor.h
+++ b/esphome/components/ble_client/sensor/ble_rssi_sensor.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "esphome/core/component.h"
 #include "esphome/components/ble_client/ble_client.h"
 #include "esphome/components/esp32_ble_tracker/esp32_ble_tracker.h"
 #include "esphome/components/sensor/sensor.h"
+#include "esphome/core/component.h"
 
 #ifdef USE_ESP32
 #include <esp_gattc_api.h>
@@ -24,6 +24,10 @@ class BLEClientRSSISensor : public sensor::Sensor, public PollingComponent, publ
 
   void gattc_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if,
                            esp_ble_gattc_cb_param_t *param) override;
+
+ protected:
+  void get_rssi_();
+  bool should_update_{false};
 };
 
 }  // namespace ble_client

From b978985aa19df5874b190d56f5df4764964f51ca Mon Sep 17 00:00:00 2001
From: marshn <marshn@spa-technology.co.uk>
Date: Mon, 6 Nov 2023 19:30:23 +0000
Subject: [PATCH 115/131] Add Byron Doorbell RF protocol (#4718)

---
 esphome/components/remote_base/__init__.py    |  49 +++++++
 .../remote_base/byronsx_protocol.cpp          | 134 ++++++++++++++++++
 .../components/remote_base/byronsx_protocol.h |  46 ++++++
 3 files changed, 229 insertions(+)
 create mode 100644 esphome/components/remote_base/byronsx_protocol.cpp
 create mode 100644 esphome/components/remote_base/byronsx_protocol.h

diff --git a/esphome/components/remote_base/__init__.py b/esphome/components/remote_base/__init__.py
index fb9d5e56a6..25dedd71d8 100644
--- a/esphome/components/remote_base/__init__.py
+++ b/esphome/components/remote_base/__init__.py
@@ -242,6 +242,55 @@ async def build_dumpers(config):
     return dumpers
 
 
+# ByronSX
+(
+    ByronSXData,
+    ByronSXBinarySensor,
+    ByronSXTrigger,
+    ByronSXAction,
+    ByronSXDumper,
+) = declare_protocol("ByronSX")
+BYRONSX_SCHEMA = cv.Schema(
+    {
+        cv.Required(CONF_ADDRESS): cv.All(cv.hex_int, cv.Range(min=0, max=0xFF)),
+        cv.Optional(CONF_COMMAND, default=0x10): cv.All(
+            cv.hex_int, cv.one_of(1, 2, 3, 5, 6, 9, 0xD, 0xE, 0x10, int=True)
+        ),
+    }
+)
+
+
+@register_binary_sensor("byronsx", ByronSXBinarySensor, BYRONSX_SCHEMA)
+def byronsx_binary_sensor(var, config):
+    cg.add(
+        var.set_data(
+            cg.StructInitializer(
+                ByronSXData,
+                ("address", config[CONF_ADDRESS]),
+                ("command", config[CONF_COMMAND]),
+            )
+        )
+    )
+
+
+@register_trigger("byronsx", ByronSXTrigger, ByronSXData)
+def byronsx_trigger(var, config):
+    pass
+
+
+@register_dumper("byronsx", ByronSXDumper)
+def byronsx_dumper(var, config):
+    pass
+
+
+@register_action("byronsx", ByronSXAction, BYRONSX_SCHEMA)
+async def byronsx_action(var, config, args):
+    template_ = await cg.templatable(config[CONF_ADDRESS], args, cg.uint8)
+    cg.add(var.set_address(template_))
+    template_ = await cg.templatable(config[CONF_COMMAND], args, cg.uint8)
+    cg.add(var.set_command(template_))
+
+
 # CanalSat
 (
     CanalSatData,
diff --git a/esphome/components/remote_base/byronsx_protocol.cpp b/esphome/components/remote_base/byronsx_protocol.cpp
new file mode 100644
index 0000000000..3096283b30
--- /dev/null
+++ b/esphome/components/remote_base/byronsx_protocol.cpp
@@ -0,0 +1,134 @@
+#include "byronsx_protocol.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace remote_base {
+
+static const char *const TAG = "remote.byronsx";
+
+static const uint32_t BIT_TIME_US = 333;
+static const uint8_t NBITS_ADDRESS = 8;
+static const uint8_t NBITS_COMMAND = 4;
+static const uint8_t NBITS_START_BIT = 1;
+static const uint8_t NBITS_DATA = NBITS_ADDRESS + NBITS_COMMAND /*+ NBITS_COMMAND*/;
+
+/*
+ByronSX Protocol
+Each transmitted packet appears to consist of thirteen bits of PWM encoded
+data. Each bit period of aprox 1ms consists of a transmitter OFF period
+followed by a transmitter ON period. The 'on' and 'off' periods are either
+short (approx 332us) or long (664us).
+
+A short 'off' followed by a long 'on' represents a '1' bit.
+A long 'off' followed by a short 'on' represents a '0' bit.
+
+A the beginning of each packet is and initial 'off' period of approx 5.6ms
+followed by a short 'on'.
+
+The data payload consists of twelve bits which appear to be an eight bit
+address floowied by a 4 bit chime number.
+
+SAAAAAAAACCCC
+
+Whese:
+S = the initial short start pulse
+A = The eight address bits
+C - The four chime bits
+
+--------------------
+
+I have also used 'RFLink' software (RLink Firmware Version: 1.1 Revision: 48)
+to capture these packets, eg:
+
+20;19;Byron;ID=004f;SWITCH=02;CMD=ON;CHIME=02;
+
+This module transmits and interprets packets in the same way as RFLink.
+
+marshn
+
+*/
+
+void ByronSXProtocol::encode(RemoteTransmitData *dst, const ByronSXData &data) {
+  uint32_t out_data = 0x0;
+
+  ESP_LOGD(TAG, "Send ByronSX: address=%04x command=%03x", data.address, data.command);
+
+  out_data = data.address;
+  out_data <<= NBITS_COMMAND;
+  out_data |= data.command;
+
+  ESP_LOGV(TAG, "Send ByronSX: out_data %03x", out_data);
+
+  // Initial Mark start bit
+  dst->mark(1 * BIT_TIME_US);
+
+  for (uint32_t mask = 1UL << (NBITS_DATA - 1); mask != 0; mask >>= 1) {
+    if (out_data & mask) {
+      dst->space(2 * BIT_TIME_US);
+      dst->mark(1 * BIT_TIME_US);
+    } else {
+      dst->space(1 * BIT_TIME_US);
+      dst->mark(2 * BIT_TIME_US);
+    }
+  }
+  // final space at end of packet
+  dst->space(17 * BIT_TIME_US);
+}
+
+optional<ByronSXData> ByronSXProtocol::decode(RemoteReceiveData src) {
+  ByronSXData out{
+      .address = 0,
+      .command = 0,
+  };
+
+  if (src.size() != (NBITS_DATA + NBITS_START_BIT) * 2) {
+    return {};
+  }
+
+  // Skip start bit
+  if (!src.expect_mark(BIT_TIME_US)) {
+    return {};
+  }
+
+  ESP_LOGVV(TAG, "%3d: %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", src.size(), src.peek(0),
+            src.peek(1), src.peek(2), src.peek(3), src.peek(4), src.peek(5), src.peek(6), src.peek(7), src.peek(8),
+            src.peek(9), src.peek(10), src.peek(11), src.peek(12), src.peek(13), src.peek(14), src.peek(15),
+            src.peek(16), src.peek(17), src.peek(18), src.peek(19));
+
+  ESP_LOGVV(TAG, "     %d %d %d %d %d %d", src.peek(20), src.peek(21), src.peek(22), src.peek(23), src.peek(24),
+            src.peek(25));
+
+  // Read data bits
+  uint32_t out_data = 0;
+  int8_t bit = NBITS_DATA;
+  while (--bit >= 0) {
+    if (src.expect_space(2 * BIT_TIME_US) && src.expect_mark(BIT_TIME_US)) {
+      out_data |= 1 << bit;
+    } else if (src.expect_space(BIT_TIME_US) && src.expect_mark(2 * BIT_TIME_US)) {
+      out_data |= 0 << bit;
+    } else {
+      ESP_LOGV(TAG, "Decode ByronSX: Fail 2, %2d %08x", bit, out_data);
+      return {};
+    }
+    ESP_LOGVV(TAG, "Decode ByronSX: Data, %2d %08x", bit, out_data);
+  }
+
+  // last bit followed by a long space
+  if (!src.peek_space_at_least(BIT_TIME_US)) {
+    ESP_LOGV(TAG, "Decode ByronSX: Fail 4 ");
+    return {};
+  }
+
+  out.command = (uint8_t) (out_data & 0xF);
+  out_data >>= NBITS_COMMAND;
+  out.address = (uint16_t) (out_data & 0xFF);
+
+  return out;
+}
+
+void ByronSXProtocol::dump(const ByronSXData &data) {
+  ESP_LOGD(TAG, "Received ByronSX: address=0x%08X, command=0x%02x", data.address, data.command);
+}
+
+}  // namespace remote_base
+}  // namespace esphome
diff --git a/esphome/components/remote_base/byronsx_protocol.h b/esphome/components/remote_base/byronsx_protocol.h
new file mode 100644
index 0000000000..5d23237ab1
--- /dev/null
+++ b/esphome/components/remote_base/byronsx_protocol.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "remote_base.h"
+
+namespace esphome {
+namespace remote_base {
+
+struct ByronSXData {
+  uint8_t address;
+  uint8_t command;
+
+  bool operator==(const ByronSXData &rhs) const {
+    // Treat 0x10 as a special, wildcard command/chime
+    // This allows us to match on just the address if wanted.
+    if (address != rhs.address) {
+      return false;
+    }
+    return (rhs.command == 0x10 || command == rhs.command);
+  }
+};
+
+class ByronSXProtocol : public RemoteProtocol<ByronSXData> {
+ public:
+  void encode(RemoteTransmitData *dst, const ByronSXData &data) override;
+  optional<ByronSXData> decode(RemoteReceiveData src) override;
+  void dump(const ByronSXData &data) override;
+};
+
+DECLARE_REMOTE_PROTOCOL(ByronSX)
+
+template<typename... Ts> class ByronSXAction : public RemoteTransmitterActionBase<Ts...> {
+ public:
+  TEMPLATABLE_VALUE(uint8_t, address)
+  TEMPLATABLE_VALUE(uint8_t, command)
+
+  void encode(RemoteTransmitData *dst, Ts... x) override {
+    ByronSXData data{};
+    data.address = this->address_.value(x...);
+    data.command = this->command_.value(x...);
+    ByronSXProtocol().encode(dst, data);
+  }
+};
+
+}  // namespace remote_base
+}  // namespace esphome

From fce59819f5627dcf32267b3da20ead54cc8acd69 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 6 Nov 2023 16:07:59 -0600
Subject: [PATCH 116/131] Refactor dashboard zeroconf support (#5681)

---
 esphome/dashboard/dashboard.py | 109 ++++++++++++++++------
 esphome/zeroconf.py            | 162 ++++++++-------------------------
 2 files changed, 123 insertions(+), 148 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index ce8976cb0f..f6eb079430 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import base64
 import binascii
 import codecs
@@ -15,7 +17,6 @@ import shutil
 import subprocess
 import threading
 from pathlib import Path
-from typing import Optional
 
 import tornado
 import tornado.concurrent
@@ -42,7 +43,13 @@ from esphome.storage_json import (
     trash_storage_path,
 )
 from esphome.util import get_serial_ports, shlex_quote
-from esphome.zeroconf import DashboardImportDiscovery, DashboardStatus, EsphomeZeroconf
+from esphome.zeroconf import (
+    ESPHOME_SERVICE_TYPE,
+    DashboardBrowser,
+    DashboardImportDiscovery,
+    DashboardStatus,
+    EsphomeZeroconf,
+)
 
 from .util import friendly_name_slugify, password_hash
 
@@ -517,6 +524,8 @@ class ImportRequestHandler(BaseHandler):
                 network,
                 encryption,
             )
+            # Make sure the device gets marked online right away
+            PING_REQUEST.set()
         except FileExistsError:
             self.set_status(500)
             self.write("File already exists")
@@ -542,13 +551,11 @@ class DownloadListRequestHandler(BaseHandler):
             self.send_error(404)
             return
 
-        from esphome.components.esp32 import (
-            get_download_types as esp32_types,
-            VARIANTS as ESP32_VARIANTS,
-        )
+        from esphome.components.esp32 import VARIANTS as ESP32_VARIANTS
+        from esphome.components.esp32 import get_download_types as esp32_types
         from esphome.components.esp8266 import get_download_types as esp8266_types
-        from esphome.components.rp2040 import get_download_types as rp2040_types
         from esphome.components.libretiny import get_download_types as libretiny_types
+        from esphome.components.rp2040 import get_download_types as rp2040_types
 
         downloads = []
         platform = storage_json.target_platform.lower()
@@ -661,12 +668,21 @@ class DashboardEntry:
         self._storage = None
         self._loaded_storage = False
 
+    def __repr__(self):
+        return (
+            f"DashboardEntry({self.path} "
+            f"address={self.address} "
+            f"web_port={self.web_port} "
+            f"name={self.name} "
+            f"no_mdns={self.no_mdns})"
+        )
+
     @property
     def filename(self):
         return os.path.basename(self.path)
 
     @property
-    def storage(self) -> Optional[StorageJSON]:
+    def storage(self) -> StorageJSON | None:
         if not self._loaded_storage:
             self._storage = StorageJSON.load(ext_storage_path(self.filename))
             self._loaded_storage = True
@@ -831,10 +847,10 @@ class PrometheusServiceDiscoveryHandler(BaseHandler):
 class BoardsRequestHandler(BaseHandler):
     @authenticated
     def get(self, platform: str):
+        from esphome.components.bk72xx.boards import BOARDS as BK72XX_BOARDS
         from esphome.components.esp32.boards import BOARDS as ESP32_BOARDS
         from esphome.components.esp8266.boards import BOARDS as ESP8266_BOARDS
         from esphome.components.rp2040.boards import BOARDS as RP2040_BOARDS
-        from esphome.components.bk72xx.boards import BOARDS as BK72XX_BOARDS
         from esphome.components.rtl87xx.boards import BOARDS as RTL87XX_BOARDS
 
         platform_to_boards = {
@@ -865,35 +881,76 @@ class BoardsRequestHandler(BaseHandler):
 
 
 class MDNSStatusThread(threading.Thread):
+    def __init__(self):
+        """Initialize the MDNSStatusThread."""
+        super().__init__()
+        # This is the current mdns state for each host (True, False, None)
+        self.host_mdns_state: dict[str, bool | None] = {}
+        # This is the hostnames to filenames mapping
+        self.host_name_to_filename: dict[str, str] = {}
+        # This is a set of host names to track (i.e no_mdns = false)
+        self.host_name_with_mdns_enabled: set[set] = set()
+        self._refresh_hosts()
+
+    def _refresh_hosts(self):
+        """Refresh the hosts to track."""
+        entries = _list_dashboard_entries()
+        host_name_with_mdns_enabled = self.host_name_with_mdns_enabled
+        host_mdns_state = self.host_mdns_state
+        host_name_to_filename = self.host_name_to_filename
+
+        for entry in entries:
+            name = entry.name
+            # If no_mdns is set, remove it from the set
+            if entry.no_mdns:
+                host_name_with_mdns_enabled.discard(name)
+                continue
+
+            # We are tracking this host
+            host_name_with_mdns_enabled.add(name)
+            filename = entry.filename
+
+            # If we just adopted/imported this host, we likely
+            # already have a state for it, so we should make sure
+            # to set it so the dashboard shows it as online
+            if name in host_mdns_state:
+                PING_RESULT[filename] = host_mdns_state[name]
+
+            # Make sure the mapping is up to date
+            # so when we get an mdns update we can map it back
+            # to the filename
+            host_name_to_filename[name] = filename
+
     def run(self):
         global IMPORT_RESULT
 
         zc = EsphomeZeroconf()
+        host_mdns_state = self.host_mdns_state
+        host_name_to_filename = self.host_name_to_filename
+        host_name_with_mdns_enabled = self.host_name_with_mdns_enabled
 
-        def on_update(dat):
-            for key, b in dat.items():
-                PING_RESULT[key] = b
+        def on_update(dat: dict[str, bool | None]) -> None:
+            """Update the global PING_RESULT dict."""
+            for name, result in dat.items():
+                host_mdns_state[name] = result
+                if name in host_name_with_mdns_enabled:
+                    filename = host_name_to_filename[name]
+                    PING_RESULT[filename] = result
 
-        stat = DashboardStatus(zc, on_update)
-        imports = DashboardImportDiscovery(zc)
+        self._refresh_hosts()
+        stat = DashboardStatus(on_update)
+        imports = DashboardImportDiscovery()
+        browser = DashboardBrowser(
+            zc, ESPHOME_SERVICE_TYPE, [stat.browser_callback, imports.browser_callback]
+        )
 
-        stat.start()
         while not STOP_EVENT.is_set():
-            entries = _list_dashboard_entries()
-            hosts = {}
-            for entry in entries:
-                if entry.no_mdns is not True:
-                    hosts[entry.filename] = f"{entry.name}.local."
-
-            stat.request_query(hosts)
+            self._refresh_hosts()
             IMPORT_RESULT = imports.import_state
-
             PING_REQUEST.wait()
             PING_REQUEST.clear()
 
-        stat.stop()
-        stat.join()
-        imports.cancel()
+        browser.cancel()
         zc.close()
 
 
diff --git a/esphome/zeroconf.py b/esphome/zeroconf.py
index 14dd740a96..d20111ce20 100644
--- a/esphome/zeroconf.py
+++ b/esphome/zeroconf.py
@@ -1,130 +1,49 @@
+from __future__ import annotations
+
 import logging
-import socket
-import threading
-import time
 from dataclasses import dataclass
-from typing import Optional
+from typing import Callable
 
 from zeroconf import (
-    DNSAddress,
-    DNSOutgoing,
-    DNSQuestion,
-    RecordUpdate,
-    RecordUpdateListener,
+    IPVersion,
     ServiceBrowser,
+    ServiceInfo,
     ServiceStateChange,
     Zeroconf,
-    current_time_millis,
 )
 
 from esphome.storage_json import StorageJSON, ext_storage_path
 
-_CLASS_IN = 1
-_FLAGS_QR_QUERY = 0x0000  # query
-_TYPE_A = 1
 _LOGGER = logging.getLogger(__name__)
 
 
-class HostResolver(RecordUpdateListener):
+class HostResolver(ServiceInfo):
     """Resolve a host name to an IP address."""
 
-    def __init__(self, name: str):
-        self.name = name
-        self.address: Optional[bytes] = None
-
-    def async_update_records(
-        self, zc: Zeroconf, now: float, records: list[RecordUpdate]
-    ) -> None:
-        """Update multiple records in one shot.
-
-        This will run in zeroconf's event loop thread so it
-        must be thread-safe.
-        """
-        for record_update in records:
-            record, _ = record_update
-            if record is None:
-                continue
-            if record.type == _TYPE_A:
-                assert isinstance(record, DNSAddress)
-                if record.name == self.name:
-                    self.address = record.address
-
-    def request(self, zc: Zeroconf, timeout: float) -> bool:
-        now = time.time()
-        delay = 0.2
-        next_ = now + delay
-        last = now + timeout
-
-        try:
-            zc.add_listener(self, None)
-            while self.address is None:
-                if last <= now:
-                    # Timeout
-                    return False
-                if next_ <= now:
-                    out = DNSOutgoing(_FLAGS_QR_QUERY)
-                    out.add_question(DNSQuestion(self.name, _TYPE_A, _CLASS_IN))
-                    zc.send(out)
-                    next_ = now + delay
-                    delay *= 2
-
-                time.sleep(min(next_, last) - now)
-                now = time.time()
-        finally:
-            zc.remove_listener(self)
-
-        return True
+    @property
+    def _is_complete(self) -> bool:
+        """The ServiceInfo has all expected properties."""
+        return bool(self._ipv4_addresses)
 
 
-class DashboardStatus(threading.Thread):
-    PING_AFTER = 15 * 1000  # Send new mDNS request after 15 seconds
-    OFFLINE_AFTER = PING_AFTER * 2  # Offline if no mDNS response after 30 seconds
-
-    def __init__(self, zc: Zeroconf, on_update) -> None:
-        threading.Thread.__init__(self)
-        self.zc = zc
-        self.query_hosts: set[str] = set()
-        self.key_to_host: dict[str, str] = {}
-        self.stop_event = threading.Event()
-        self.query_event = threading.Event()
+class DashboardStatus:
+    def __init__(self, on_update: Callable[[dict[str, bool | None], []]]) -> None:
+        """Initialize the dashboard status."""
         self.on_update = on_update
 
-    def request_query(self, hosts: dict[str, str]) -> None:
-        self.query_hosts = set(hosts.values())
-        self.key_to_host = hosts
-        self.query_event.set()
-
-    def stop(self) -> None:
-        self.stop_event.set()
-        self.query_event.set()
-
-    def host_status(self, key: str) -> bool:
-        entries = self.zc.cache.entries_with_name(key)
-        if not entries:
-            return False
-        now = current_time_millis()
-
-        return any(
-            (entry.created + DashboardStatus.OFFLINE_AFTER) >= now for entry in entries
-        )
-
-    def run(self) -> None:
-        while not self.stop_event.is_set():
-            self.on_update(
-                {key: self.host_status(host) for key, host in self.key_to_host.items()}
-            )
-            now = current_time_millis()
-            for host in self.query_hosts:
-                entries = self.zc.cache.entries_with_name(host)
-                if not entries or all(
-                    (entry.created + DashboardStatus.PING_AFTER) <= now
-                    for entry in entries
-                ):
-                    out = DNSOutgoing(_FLAGS_QR_QUERY)
-                    out.add_question(DNSQuestion(host, _TYPE_A, _CLASS_IN))
-                    self.zc.send(out)
-            self.query_event.wait()
-            self.query_event.clear()
+    def browser_callback(
+        self,
+        zeroconf: Zeroconf,
+        service_type: str,
+        name: str,
+        state_change: ServiceStateChange,
+    ) -> None:
+        """Handle a service update."""
+        short_name = name.partition(".")[0]
+        if state_change == ServiceStateChange.Removed:
+            self.on_update({short_name: False})
+        elif state_change in (ServiceStateChange.Updated, ServiceStateChange.Added):
+            self.on_update({short_name: True})
 
 
 ESPHOME_SERVICE_TYPE = "_esphomelib._tcp.local."
@@ -138,7 +57,7 @@ TXT_RECORD_VERSION = b"version"
 
 @dataclass
 class DiscoveredImport:
-    friendly_name: Optional[str]
+    friendly_name: str | None
     device_name: str
     package_import_url: str
     project_name: str
@@ -146,15 +65,15 @@ class DiscoveredImport:
     network: str
 
 
+class DashboardBrowser(ServiceBrowser):
+    """A class to browse for ESPHome nodes."""
+
+
 class DashboardImportDiscovery:
-    def __init__(self, zc: Zeroconf) -> None:
-        self.zc = zc
-        self.service_browser = ServiceBrowser(
-            self.zc, ESPHOME_SERVICE_TYPE, [self._on_update]
-        )
+    def __init__(self) -> None:
         self.import_state: dict[str, DiscoveredImport] = {}
 
-    def _on_update(
+    def browser_callback(
         self,
         zeroconf: Zeroconf,
         service_type: str,
@@ -167,8 +86,6 @@ class DashboardImportDiscovery:
             name,
             state_change,
         )
-        if service_type != ESPHOME_SERVICE_TYPE:
-            return
         if state_change == ServiceStateChange.Removed:
             self.import_state.pop(name, None)
             return
@@ -212,9 +129,6 @@ class DashboardImportDiscovery:
             network=network,
         )
 
-    def cancel(self) -> None:
-        self.service_browser.cancel()
-
     def update_device_mdns(self, node_name: str, version: str):
         storage_path = ext_storage_path(node_name + ".yaml")
         storage_json = StorageJSON.load(storage_path)
@@ -234,7 +148,11 @@ class DashboardImportDiscovery:
 
 class EsphomeZeroconf(Zeroconf):
     def resolve_host(self, host: str, timeout=3.0):
-        info = HostResolver(host)
-        if info.request(self, timeout):
-            return socket.inet_ntoa(info.address)
+        """Resolve a host name to an IP address."""
+        name = host.partition(".")[0]
+        info = HostResolver(f"{name}.{ESPHOME_SERVICE_TYPE}", ESPHOME_SERVICE_TYPE)
+        if (info.load_from_cache(self) or info.request(self, timeout * 1000)) and (
+            addresses := info.ip_addresses_by_version(IPVersion.V4Only)
+        ):
+            return str(addresses[0])
         return None

From 43b36ac3c7ac6843ddd34605fa31a047590bb0c2 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:38:38 +1300
Subject: [PATCH 117/131] Allow static assets to be cached if not in debug mode
 (#5684)

---
 esphome/dashboard/dashboard.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index f6eb079430..b416b00e60 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -1328,9 +1328,11 @@ def make_app(debug=get_bool_env(ENV_DEV)):
             if "favicon.ico" in path:
                 self.set_header("Cache-Control", "max-age=84600, public")
             else:
-                self.set_header(
-                    "Cache-Control", "no-store, no-cache, must-revalidate, max-age=0"
-                )
+                if debug:
+                    self.set_header(
+                        "Cache-Control",
+                        "no-store, no-cache, must-revalidate, max-age=0",
+                    )
 
     app_settings = {
         "debug": debug,

From d141e1cd6725e5c6a34052b4c097be52eebbbd29 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:38:52 +1300
Subject: [PATCH 118/131] Remove extra code in old sgp40 (#5685)

---
 esphome/components/sgp40/sensor.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/components/sgp40/sensor.py b/esphome/components/sgp40/sensor.py
index cb4231c168..ad9de6fe24 100644
--- a/esphome/components/sgp40/sensor.py
+++ b/esphome/components/sgp40/sensor.py
@@ -2,7 +2,7 @@ import esphome.config_validation as cv
 
 CODEOWNERS = ["@SenexCrenshaw"]
 
-CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
+CONFIG_SCHEMA = cv.invalid(
     "SGP40 is deprecated.\nPlease use the SGP4x platform instead.\nSGP4x supports both SPG40 and SGP41.\n"
     " See https://esphome.io/components/sensor/sgp4x.html"
 )

From dd0270207f1b356e7f275cfd8b2d8bff53451f8c Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:39:47 +1300
Subject: [PATCH 119/131] Allow pulse light effect to have separate on and off
 transition lengths (#5659)

---
 esphome/components/light/base_light_effects.h | 10 ++++---
 esphome/components/light/effects.py           | 30 ++++++++++++++++---
 tests/test1.yaml                              | 14 +++++++++
 3 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/esphome/components/light/base_light_effects.h b/esphome/components/light/base_light_effects.h
index 9211bba7c9..d126e4960c 100644
--- a/esphome/components/light/base_light_effects.h
+++ b/esphome/components/light/base_light_effects.h
@@ -3,8 +3,8 @@
 #include <utility>
 #include <vector>
 
-#include "light_effect.h"
 #include "esphome/core/automation.h"
+#include "light_effect.h"
 
 namespace esphome {
 namespace light {
@@ -27,8 +27,8 @@ class PulseLightEffect : public LightEffect {
     auto call = this->state_->turn_on();
     float out = this->on_ ? this->max_brightness : this->min_brightness;
     call.set_brightness_if_supported(out);
+    call.set_transition_length_if_supported(this->on_ ? this->transition_on_length_ : this->transition_off_length_);
     this->on_ = !this->on_;
-    call.set_transition_length_if_supported(this->transition_length_);
     // don't tell HA every change
     call.set_publish(false);
     call.set_save(false);
@@ -37,7 +37,8 @@ class PulseLightEffect : public LightEffect {
     this->last_color_change_ = now;
   }
 
-  void set_transition_length(uint32_t transition_length) { this->transition_length_ = transition_length; }
+  void set_transition_on_length(uint32_t transition_length) { this->transition_on_length_ = transition_length; }
+  void set_transition_off_length(uint32_t transition_length) { this->transition_off_length_ = transition_length; }
 
   void set_update_interval(uint32_t update_interval) { this->update_interval_ = update_interval; }
 
@@ -49,7 +50,8 @@ class PulseLightEffect : public LightEffect {
  protected:
   bool on_ = false;
   uint32_t last_color_change_{0};
-  uint32_t transition_length_{};
+  uint32_t transition_on_length_{};
+  uint32_t transition_off_length_{};
   uint32_t update_interval_{};
   float min_brightness{0.0};
   float max_brightness{1.0};
diff --git a/esphome/components/light/effects.py b/esphome/components/light/effects.py
index c694d6f50c..5212e90938 100644
--- a/esphome/components/light/effects.py
+++ b/esphome/components/light/effects.py
@@ -76,6 +76,8 @@ CONF_ADDRESSABLE_RANDOM_TWINKLE = "addressable_random_twinkle"
 CONF_ADDRESSABLE_FIREWORKS = "addressable_fireworks"
 CONF_ADDRESSABLE_FLICKER = "addressable_flicker"
 CONF_AUTOMATION = "automation"
+CONF_ON_LENGTH = "on_length"
+CONF_OFF_LENGTH = "off_length"
 
 BINARY_EFFECTS = []
 MONOCHROMATIC_EFFECTS = []
@@ -170,9 +172,15 @@ async def automation_effect_to_code(config, effect_id):
     PulseLightEffect,
     "Pulse",
     {
-        cv.Optional(
-            CONF_TRANSITION_LENGTH, default="1s"
-        ): cv.positive_time_period_milliseconds,
+        cv.Optional(CONF_TRANSITION_LENGTH, default="1s"): cv.Any(
+            cv.positive_time_period_milliseconds,
+            cv.Schema(
+                {
+                    cv.Required(CONF_ON_LENGTH): cv.positive_time_period_milliseconds,
+                    cv.Required(CONF_OFF_LENGTH): cv.positive_time_period_milliseconds,
+                }
+            ),
+        ),
         cv.Optional(
             CONF_UPDATE_INTERVAL, default="1s"
         ): cv.positive_time_period_milliseconds,
@@ -182,7 +190,21 @@ async def automation_effect_to_code(config, effect_id):
 )
 async def pulse_effect_to_code(config, effect_id):
     effect = cg.new_Pvariable(effect_id, config[CONF_NAME])
-    cg.add(effect.set_transition_length(config[CONF_TRANSITION_LENGTH]))
+    if isinstance(config[CONF_TRANSITION_LENGTH], dict):
+        cg.add(
+            effect.set_transition_on_length(
+                config[CONF_TRANSITION_LENGTH][CONF_ON_LENGTH]
+            )
+        )
+        cg.add(
+            effect.set_transition_off_length(
+                config[CONF_TRANSITION_LENGTH][CONF_OFF_LENGTH]
+            )
+        )
+    else:
+        transition_length = config[CONF_TRANSITION_LENGTH]
+        cg.add(effect.set_transition_on_length(transition_length))
+        cg.add(effect.set_transition_off_length(transition_length))
     cg.add(effect.set_update_interval(config[CONF_UPDATE_INTERVAL]))
     cg.add(
         effect.set_min_max_brightness(
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 7bd6dcb41d..64d1d36f52 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -2179,6 +2179,20 @@ light:
             state += 1;
             if (state == 4)
               state = 0;
+      - pulse:
+          transition_length: 10s
+          update_interval: 20s
+          min_brightness: 10%
+          max_brightness: 90%
+      - pulse:
+          name: pulse2
+          transition_length:
+            on_length: 10s
+            off_length: 5s
+          update_interval: 15s
+          min_brightness: 10%
+          max_brightness: 90%
+
   - platform: rgb
     name: Living Room Lights
     id: ${roomname}_lights

From 972c18a7ca2dd36fc4118152fff6007f760df873 Mon Sep 17 00:00:00 2001
From: Greg Cormier <gcormier@gmail.com>
Date: Mon, 6 Nov 2023 18:46:30 -0500
Subject: [PATCH 120/131] Add differential pressure sensor support for CFSensor
 XGZP68xxD devices (#5562)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                               |  1 +
 esphome/components/xgzp68xx/__init__.py  |  1 +
 esphome/components/xgzp68xx/sensor.py    | 62 ++++++++++++++++
 esphome/components/xgzp68xx/xgzp68xx.cpp | 91 ++++++++++++++++++++++++
 esphome/components/xgzp68xx/xgzp68xx.h   | 27 +++++++
 tests/test1.yaml                         |  8 +++
 6 files changed, 190 insertions(+)
 create mode 100644 esphome/components/xgzp68xx/__init__.py
 create mode 100644 esphome/components/xgzp68xx/sensor.py
 create mode 100644 esphome/components/xgzp68xx/xgzp68xx.cpp
 create mode 100644 esphome/components/xgzp68xx/xgzp68xx.h

diff --git a/CODEOWNERS b/CODEOWNERS
index a48d0ab2e0..067b886320 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -349,6 +349,7 @@ esphome/components/wiegand/* @ssieb
 esphome/components/wireguard/* @droscy @lhoracek @thomas0bernard
 esphome/components/wl_134/* @hobbypunk90
 esphome/components/x9c/* @EtienneMD
+esphome/components/xgzp68xx/* @gcormier
 esphome/components/xiaomi_lywsd03mmc/* @ahpohl
 esphome/components/xiaomi_mhoc303/* @drug123
 esphome/components/xiaomi_mhoc401/* @vevsvevs
diff --git a/esphome/components/xgzp68xx/__init__.py b/esphome/components/xgzp68xx/__init__.py
new file mode 100644
index 0000000000..122ffaf6ed
--- /dev/null
+++ b/esphome/components/xgzp68xx/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@gcormier"]
diff --git a/esphome/components/xgzp68xx/sensor.py b/esphome/components/xgzp68xx/sensor.py
new file mode 100644
index 0000000000..3e381aaa61
--- /dev/null
+++ b/esphome/components/xgzp68xx/sensor.py
@@ -0,0 +1,62 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, sensor
+from esphome.const import (
+    DEVICE_CLASS_PRESSURE,
+    CONF_ID,
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_PASCAL,
+    UNIT_CELSIUS,
+    CONF_TEMPERATURE,
+    CONF_PRESSURE,
+)
+
+DEPENDENCIES = ["i2c"]
+CODEOWNERS = ["@gcormier"]
+
+CONF_K_VALUE = "k_value"
+
+xgzp68xx_ns = cg.esphome_ns.namespace("xgzp68xx")
+XGZP68XXComponent = xgzp68xx_ns.class_(
+    "XGZP68XXComponent", cg.PollingComponent, i2c.I2CDevice
+)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(XGZP68XXComponent),
+            cv.Optional(CONF_PRESSURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_PASCAL,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_PRESSURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_TEMPERATURE): sensor.sensor_schema(
+                unit_of_measurement=UNIT_CELSIUS,
+                accuracy_decimals=1,
+                device_class=DEVICE_CLASS_TEMPERATURE,
+                state_class=STATE_CLASS_MEASUREMENT,
+            ),
+            cv.Optional(CONF_K_VALUE, default=4096): cv.uint16_t,
+        }
+    )
+    .extend(cv.polling_component_schema("60s"))
+    .extend(i2c.i2c_device_schema(0x6D))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await cg.register_component(var, config)
+    await i2c.register_i2c_device(var, config)
+
+    if temperature_config := config.get(CONF_TEMPERATURE):
+        sens = await sensor.new_sensor(temperature_config)
+        cg.add(var.set_temperature_sensor(sens))
+
+    if pressure_config := config.get(CONF_PRESSURE):
+        sens = await sensor.new_sensor(pressure_config)
+        cg.add(var.set_pressure_sensor(sens))
+
+    cg.add(var.set_k_value(config[CONF_K_VALUE]))
diff --git a/esphome/components/xgzp68xx/xgzp68xx.cpp b/esphome/components/xgzp68xx/xgzp68xx.cpp
new file mode 100644
index 0000000000..ea3583c3c5
--- /dev/null
+++ b/esphome/components/xgzp68xx/xgzp68xx.cpp
@@ -0,0 +1,91 @@
+#include "xgzp68xx.h"
+#include "esphome/core/log.h"
+#include "esphome/core/hal.h"
+#include "esphome/core/helpers.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace xgzp68xx {
+
+static const char *const TAG = "xgzp68xx.sensor";
+
+static const uint8_t CMD_ADDRESS = 0x30;
+static const uint8_t SYSCONFIG_ADDRESS = 0xA5;
+static const uint8_t PCONFIG_ADDRESS = 0xA6;
+static const uint8_t READ_COMMAND = 0x0A;
+
+void XGZP68XXComponent::update() {
+  // Request temp + pressure acquisition
+  this->write_register(0x30, &READ_COMMAND, 1);
+
+  // Wait 20mS per datasheet
+  this->set_timeout("measurement", 20, [this]() {
+    uint8_t data[5];
+    uint32_t pressure_raw;
+    uint16_t temperature_raw;
+    float pressure_in_pa, temperature;
+    int success;
+
+    // Read the sensor data
+    success = this->read_register(0x06, data, 5);
+    if (success != 0) {
+      ESP_LOGE(TAG, "Failed to read sensor data! Error code: %i", success);
+      return;
+    }
+
+    pressure_raw = encode_uint24(data[0], data[1], data[2]);
+    temperature_raw = encode_uint16(data[3], data[4]);
+
+    // Convert the pressure data to hPa
+    ESP_LOGV(TAG, "Got raw pressure=%d, raw temperature=%d ", pressure_raw, temperature_raw);
+    ESP_LOGV(TAG, "K value is %d ", this->k_value_);
+
+    // The most significant bit of both pressure and temperature will be 1 to indicate a negative value.
+    // This is directly from the datasheet, and the calculations below will handle this.
+    if (pressure_raw > pow(2, 23)) {
+      // Negative pressure
+      pressure_in_pa = (pressure_raw - pow(2, 24)) / (float) (this->k_value_);
+    } else {
+      // Positive pressure
+      pressure_in_pa = pressure_raw / (float) (this->k_value_);
+    }
+
+    if (temperature_raw > pow(2, 15)) {
+      // Negative temperature
+      temperature = (float) (temperature_raw - pow(2, 16)) / 256.0f;
+    } else {
+      // Positive temperature
+      temperature = (float) temperature_raw / 256.0f;
+    }
+
+    if (this->pressure_sensor_ != nullptr)
+      this->pressure_sensor_->publish_state(pressure_in_pa);
+
+    if (this->temperature_sensor_ != nullptr)
+      this->temperature_sensor_->publish_state(temperature);
+  });  // end of set_timeout
+}
+
+void XGZP68XXComponent::setup() {
+  ESP_LOGD(TAG, "Setting up XGZP68xx...");
+  uint8_t config;
+
+  // Display some sample bits to confirm we are talking to the sensor
+  this->read_register(SYSCONFIG_ADDRESS, &config, 1);
+  ESP_LOGCONFIG(TAG, "Gain value is %d", (config >> 3) & 0b111);
+  ESP_LOGCONFIG(TAG, "XGZP68xx started!");
+}
+
+void XGZP68XXComponent::dump_config() {
+  ESP_LOGCONFIG(TAG, "XGZP68xx");
+  LOG_SENSOR("  ", "Temperature: ", this->temperature_sensor_);
+  LOG_SENSOR("  ", "Pressure: ", this->pressure_sensor_);
+  LOG_I2C_DEVICE(this);
+  if (this->is_failed()) {
+    ESP_LOGE(TAG, "  Connection with XGZP68xx failed!");
+  }
+  LOG_UPDATE_INTERVAL(this);
+}
+
+}  // namespace xgzp68xx
+}  // namespace esphome
diff --git a/esphome/components/xgzp68xx/xgzp68xx.h b/esphome/components/xgzp68xx/xgzp68xx.h
new file mode 100644
index 0000000000..1bb7304b15
--- /dev/null
+++ b/esphome/components/xgzp68xx/xgzp68xx.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/i2c/i2c.h"
+
+namespace esphome {
+namespace xgzp68xx {
+
+class XGZP68XXComponent : public PollingComponent, public sensor::Sensor, public i2c::I2CDevice {
+ public:
+  SUB_SENSOR(temperature)
+  SUB_SENSOR(pressure)
+  void set_k_value(uint16_t k_value) { this->k_value_ = k_value; }
+
+  void update() override;
+  void setup() override;
+  void dump_config() override;
+
+ protected:
+  /// Internal method to read the pressure from the component after it has been scheduled.
+  void read_pressure_();
+  uint16_t k_value_;
+};
+
+}  // namespace xgzp68xx
+}  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 64d1d36f52..f653960c40 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -351,6 +351,14 @@ dfrobot_sen0395:
     uart_id: dfrobot_mmwave_uart
 
 sensor:
+  - platform: xgzp68xx
+    i2c_id: i2c_bus
+    temperature:
+      name: Pressure Temperature
+    pressure:
+      name: Differential pressure
+    k_value: 4096
+
   - platform: pmwcs3
     i2c_id: i2c_bus
     e25:

From 7ac9caa169d2375a22f1e87d842571da479acb6e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Nov 2023 12:48:37 +1300
Subject: [PATCH 121/131] Bump zeroconf from 0.119.0 to 0.120.0 (#5682)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 5c57f3e933..2747258883 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20230904.0
 aioesphomeapi==18.2.1
-zeroconf==0.119.0
+zeroconf==0.120.0
 
 # esp-idf requires this, but doesn't bundle it by default
 # https://github.com/espressif/esp-idf/blob/220590d599e134d7a5e7f1e683cc4550349ffbf8/requirements.txt#L24

From defe8ac97b580fede9584f50c8ee6feacb05d4b2 Mon Sep 17 00:00:00 2001
From: Angel Nunez Mencias <git@angelnu.com>
Date: Tue, 7 Nov 2023 01:17:29 +0100
Subject: [PATCH 122/131] Add spi support for ade7953 (#5439)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 CODEOWNERS                                    |   3 +
 esphome/components/ade7953/__init__.py        |   1 +
 esphome/components/ade7953/ade7953.cpp        |  53 -----
 esphome/components/ade7953/ade7953.h          |  97 ---------
 esphome/components/ade7953/sensor.py          |  91 +-------
 esphome/components/ade7953_base/__init__.py   | 196 ++++++++++++++++++
 .../components/ade7953_base/ade7953_base.cpp  | 129 ++++++++++++
 .../components/ade7953_base/ade7953_base.h    | 121 +++++++++++
 esphome/components/ade7953_i2c/__init__.py    |   1 +
 .../components/ade7953_i2c/ade7953_i2c.cpp    |  80 +++++++
 esphome/components/ade7953_i2c/ade7953_i2c.h  |  28 +++
 esphome/components/ade7953_i2c/sensor.py      |  27 +++
 esphome/components/ade7953_spi/__init__.py    |   1 +
 .../components/ade7953_spi/ade7953_spi.cpp    |  81 ++++++++
 esphome/components/ade7953_spi/ade7953_spi.h  |  32 +++
 esphome/components/ade7953_spi/sensor.py      |  27 +++
 tests/test11.5.yaml                           |  63 ++++++
 tests/test3.1.yaml                            |  44 +++-
 18 files changed, 834 insertions(+), 241 deletions(-)
 delete mode 100644 esphome/components/ade7953/ade7953.cpp
 delete mode 100644 esphome/components/ade7953/ade7953.h
 create mode 100644 esphome/components/ade7953_base/__init__.py
 create mode 100644 esphome/components/ade7953_base/ade7953_base.cpp
 create mode 100644 esphome/components/ade7953_base/ade7953_base.h
 create mode 100644 esphome/components/ade7953_i2c/__init__.py
 create mode 100644 esphome/components/ade7953_i2c/ade7953_i2c.cpp
 create mode 100644 esphome/components/ade7953_i2c/ade7953_i2c.h
 create mode 100644 esphome/components/ade7953_i2c/sensor.py
 create mode 100644 esphome/components/ade7953_spi/__init__.py
 create mode 100644 esphome/components/ade7953_spi/ade7953_spi.cpp
 create mode 100644 esphome/components/ade7953_spi/ade7953_spi.h
 create mode 100644 esphome/components/ade7953_spi/sensor.py

diff --git a/CODEOWNERS b/CODEOWNERS
index 067b886320..2dcef6c514 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -17,6 +17,9 @@ esphome/components/ac_dimmer/* @glmnet
 esphome/components/adc/* @esphome/core
 esphome/components/adc128s102/* @DeerMaximum
 esphome/components/addressable_light/* @justfalter
+esphome/components/ade7953/* @angelnu
+esphome/components/ade7953_i2c/* @angelnu
+esphome/components/ade7953_spi/* @angelnu
 esphome/components/airthings_ble/* @jeromelaban
 esphome/components/airthings_wave_base/* @jeromelaban @kpfleming @ncareau
 esphome/components/airthings_wave_mini/* @ncareau
diff --git a/esphome/components/ade7953/__init__.py b/esphome/components/ade7953/__init__.py
index e69de29bb2..d3078a0b67 100644
--- a/esphome/components/ade7953/__init__.py
+++ b/esphome/components/ade7953/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@angelnu"]
diff --git a/esphome/components/ade7953/ade7953.cpp b/esphome/components/ade7953/ade7953.cpp
deleted file mode 100644
index 2c61fc6a44..0000000000
--- a/esphome/components/ade7953/ade7953.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "ade7953.h"
-#include "esphome/core/log.h"
-
-namespace esphome {
-namespace ade7953 {
-
-static const char *const TAG = "ade7953";
-
-void ADE7953::dump_config() {
-  ESP_LOGCONFIG(TAG, "ADE7953:");
-  LOG_PIN("  IRQ Pin: ", irq_pin_);
-  LOG_I2C_DEVICE(this);
-  LOG_UPDATE_INTERVAL(this);
-  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
-  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
-  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
-  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
-  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
-}
-
-#define ADE_PUBLISH_(name, val, factor) \
-  if (err == i2c::ERROR_OK && this->name##_sensor_) { \
-    float value = (val) / (factor); \
-    this->name##_sensor_->publish_state(value); \
-  }
-#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
-
-void ADE7953::update() {
-  if (!this->is_setup_)
-    return;
-
-  uint32_t val;
-  i2c::ErrorCode err = ade_read_32_(0x0312, &val);
-  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
-  err = ade_read_32_(0x0313, &val);
-  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
-  err = ade_read_32_(0x031A, &val);
-  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
-  err = ade_read_32_(0x031B, &val);
-  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
-  err = ade_read_32_(0x031C, &val);
-  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
-
-  //    auto apparent_power_a = this->ade_read_<int32_t>(0x0310);
-  //    auto apparent_power_b = this->ade_read_<int32_t>(0x0311);
-  //    auto reactive_power_a = this->ade_read_<int32_t>(0x0314);
-  //    auto reactive_power_b = this->ade_read_<int32_t>(0x0315);
-  //    auto power_factor_a = this->ade_read_<int16_t>(0x010A);
-  //    auto power_factor_b = this->ade_read_<int16_t>(0x010B);
-}
-
-}  // namespace ade7953
-}  // namespace esphome
diff --git a/esphome/components/ade7953/ade7953.h b/esphome/components/ade7953/ade7953.h
deleted file mode 100644
index c0c1cc4db8..0000000000
--- a/esphome/components/ade7953/ade7953.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#pragma once
-
-#include "esphome/core/component.h"
-#include "esphome/core/hal.h"
-#include "esphome/components/i2c/i2c.h"
-#include "esphome/components/sensor/sensor.h"
-
-#include <vector>
-
-namespace esphome {
-namespace ade7953 {
-
-class ADE7953 : public i2c::I2CDevice, public PollingComponent {
- public:
-  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
-  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
-  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
-  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
-  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
-    active_power_a_sensor_ = active_power_a_sensor;
-  }
-  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
-    active_power_b_sensor_ = active_power_b_sensor;
-  }
-
-  void setup() override {
-    if (this->irq_pin_ != nullptr) {
-      this->irq_pin_->setup();
-    }
-    this->set_timeout(100, [this]() {
-      this->ade_write_8_(0x0010, 0x04);
-      this->ade_write_8_(0x00FE, 0xAD);
-      this->ade_write_16_(0x0120, 0x0030);
-      this->is_setup_ = true;
-    });
-  }
-
-  void dump_config() override;
-
-  void update() override;
-
- protected:
-  i2c::ErrorCode ade_write_8_(uint16_t reg, uint8_t value) {
-    std::vector<uint8_t> data;
-    data.push_back(reg >> 8);
-    data.push_back(reg >> 0);
-    data.push_back(value);
-    return write(data.data(), data.size());
-  }
-  i2c::ErrorCode ade_write_16_(uint16_t reg, uint16_t value) {
-    std::vector<uint8_t> data;
-    data.push_back(reg >> 8);
-    data.push_back(reg >> 0);
-    data.push_back(value >> 8);
-    data.push_back(value >> 0);
-    return write(data.data(), data.size());
-  }
-  i2c::ErrorCode ade_write_32_(uint16_t reg, uint32_t value) {
-    std::vector<uint8_t> data;
-    data.push_back(reg >> 8);
-    data.push_back(reg >> 0);
-    data.push_back(value >> 24);
-    data.push_back(value >> 16);
-    data.push_back(value >> 8);
-    data.push_back(value >> 0);
-    return write(data.data(), data.size());
-  }
-  i2c::ErrorCode ade_read_32_(uint16_t reg, uint32_t *value) {
-    uint8_t reg_data[2];
-    reg_data[0] = reg >> 8;
-    reg_data[1] = reg >> 0;
-    i2c::ErrorCode err = write(reg_data, 2);
-    if (err != i2c::ERROR_OK)
-      return err;
-    uint8_t recv[4];
-    err = read(recv, 4);
-    if (err != i2c::ERROR_OK)
-      return err;
-    *value = 0;
-    *value |= ((uint32_t) recv[0]) << 24;
-    *value |= ((uint32_t) recv[1]) << 16;
-    *value |= ((uint32_t) recv[2]) << 8;
-    *value |= ((uint32_t) recv[3]);
-    return i2c::ERROR_OK;
-  }
-
-  InternalGPIOPin *irq_pin_{nullptr};
-  bool is_setup_{false};
-  sensor::Sensor *voltage_sensor_{nullptr};
-  sensor::Sensor *current_a_sensor_{nullptr};
-  sensor::Sensor *current_b_sensor_{nullptr};
-  sensor::Sensor *active_power_a_sensor_{nullptr};
-  sensor::Sensor *active_power_b_sensor_{nullptr};
-};
-
-}  // namespace ade7953
-}  // namespace esphome
diff --git a/esphome/components/ade7953/sensor.py b/esphome/components/ade7953/sensor.py
index 8a43baf475..0caa2ef454 100644
--- a/esphome/components/ade7953/sensor.py
+++ b/esphome/components/ade7953/sensor.py
@@ -1,90 +1,5 @@
-import esphome.codegen as cg
 import esphome.config_validation as cv
-from esphome.components import sensor, i2c
-from esphome import pins
-from esphome.const import (
-    CONF_ID,
-    CONF_IRQ_PIN,
-    CONF_VOLTAGE,
-    DEVICE_CLASS_CURRENT,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_VOLTAGE,
-    STATE_CLASS_MEASUREMENT,
-    UNIT_AMPERE,
-    UNIT_VOLT,
-    UNIT_WATT,
+
+CONFIG_SCHEMA = CONFIG_SCHEMA = cv.invalid(
+    "The ade7953 sensor component has been renamed to ade7953_i2c."
 )
-
-DEPENDENCIES = ["i2c"]
-
-ade7953_ns = cg.esphome_ns.namespace("ade7953")
-ADE7953 = ade7953_ns.class_("ADE7953", cg.PollingComponent, i2c.I2CDevice)
-
-CONF_CURRENT_A = "current_a"
-CONF_CURRENT_B = "current_b"
-CONF_ACTIVE_POWER_A = "active_power_a"
-CONF_ACTIVE_POWER_B = "active_power_b"
-
-CONFIG_SCHEMA = (
-    cv.Schema(
-        {
-            cv.GenerateID(): cv.declare_id(ADE7953),
-            cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
-            cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
-                unit_of_measurement=UNIT_VOLT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_VOLTAGE,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
-                unit_of_measurement=UNIT_AMPERE,
-                accuracy_decimals=2,
-                device_class=DEVICE_CLASS_CURRENT,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-            cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
-                unit_of_measurement=UNIT_WATT,
-                accuracy_decimals=1,
-                device_class=DEVICE_CLASS_POWER,
-                state_class=STATE_CLASS_MEASUREMENT,
-            ),
-        }
-    )
-    .extend(cv.polling_component_schema("60s"))
-    .extend(i2c.i2c_device_schema(0x38))
-)
-
-
-async def to_code(config):
-    var = cg.new_Pvariable(config[CONF_ID])
-    await cg.register_component(var, config)
-    await i2c.register_i2c_device(var, config)
-
-    if irq_pin_config := config.get(CONF_IRQ_PIN):
-        irq_pin = await cg.gpio_pin_expression(irq_pin_config)
-        cg.add(var.set_irq_pin(irq_pin))
-
-    for key in [
-        CONF_VOLTAGE,
-        CONF_CURRENT_A,
-        CONF_CURRENT_B,
-        CONF_ACTIVE_POWER_A,
-        CONF_ACTIVE_POWER_B,
-    ]:
-        if key not in config:
-            continue
-        conf = config[key]
-        sens = await sensor.new_sensor(conf)
-        cg.add(getattr(var, f"set_{key}_sensor")(sens))
diff --git a/esphome/components/ade7953_base/__init__.py b/esphome/components/ade7953_base/__init__.py
new file mode 100644
index 0000000000..d4c18f8ffd
--- /dev/null
+++ b/esphome/components/ade7953_base/__init__.py
@@ -0,0 +1,196 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import sensor
+from esphome import pins
+from esphome.const import (
+    CONF_IRQ_PIN,
+    CONF_VOLTAGE,
+    CONF_FREQUENCY,
+    DEVICE_CLASS_CURRENT,
+    DEVICE_CLASS_APPARENT_POWER,
+    DEVICE_CLASS_POWER,
+    DEVICE_CLASS_REACTIVE_POWER,
+    DEVICE_CLASS_POWER_FACTOR,
+    DEVICE_CLASS_VOLTAGE,
+    DEVICE_CLASS_FREQUENCY,
+    STATE_CLASS_MEASUREMENT,
+    UNIT_VOLT,
+    UNIT_HERTZ,
+    UNIT_AMPERE,
+    UNIT_VOLT_AMPS,
+    UNIT_WATT,
+    UNIT_VOLT_AMPS_REACTIVE,
+    UNIT_PERCENT,
+)
+
+CONF_CURRENT_A = "current_a"
+CONF_CURRENT_B = "current_b"
+CONF_ACTIVE_POWER_A = "active_power_a"
+CONF_ACTIVE_POWER_B = "active_power_b"
+CONF_APPARENT_POWER_A = "apparent_power_a"
+CONF_APPARENT_POWER_B = "apparent_power_b"
+CONF_REACTIVE_POWER_A = "reactive_power_a"
+CONF_REACTIVE_POWER_B = "reactive_power_b"
+CONF_POWER_FACTOR_A = "power_factor_a"
+CONF_POWER_FACTOR_B = "power_factor_b"
+CONF_VOLTAGE_PGA_GAIN = "voltage_pga_gain"
+CONF_CURRENT_PGA_GAIN_A = "current_pga_gain_a"
+CONF_CURRENT_PGA_GAIN_B = "current_pga_gain_b"
+CONF_VOLTAGE_GAIN = "voltage_gain"
+CONF_CURRENT_GAIN_A = "current_gain_a"
+CONF_CURRENT_GAIN_B = "current_gain_b"
+CONF_ACTIVE_POWER_GAIN_A = "active_power_gain_a"
+CONF_ACTIVE_POWER_GAIN_B = "active_power_gain_b"
+PGA_GAINS = {
+    "1x": 0b000,
+    "2x": 0b001,
+    "4x": 0b010,
+    "8x": 0b011,
+    "16x": 0b100,
+    "22x": 0b101,
+}
+
+ade7953_base_ns = cg.esphome_ns.namespace("ade7953_base")
+ADE7953 = ade7953_base_ns.class_("ADE7953", cg.PollingComponent)
+
+ADE7953_CONFIG_SCHEMA = cv.Schema(
+    {
+        cv.Optional(CONF_IRQ_PIN): pins.internal_gpio_input_pin_schema,
+        cv.Optional(CONF_VOLTAGE): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_VOLTAGE,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_FREQUENCY): sensor.sensor_schema(
+            unit_of_measurement=UNIT_HERTZ,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_FREQUENCY,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_CURRENT_A): sensor.sensor_schema(
+            unit_of_measurement=UNIT_AMPERE,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_CURRENT,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_CURRENT_B): sensor.sensor_schema(
+            unit_of_measurement=UNIT_AMPERE,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_CURRENT,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_ACTIVE_POWER_A): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_ACTIVE_POWER_B): sensor.sensor_schema(
+            unit_of_measurement=UNIT_WATT,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_APPARENT_POWER_A): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT_AMPS,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_APPARENT_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_APPARENT_POWER_B): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT_AMPS,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_APPARENT_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_REACTIVE_POWER_A): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_REACTIVE_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_REACTIVE_POWER_B): sensor.sensor_schema(
+            unit_of_measurement=UNIT_VOLT_AMPS_REACTIVE,
+            accuracy_decimals=1,
+            device_class=DEVICE_CLASS_REACTIVE_POWER,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_POWER_FACTOR_A): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER_FACTOR,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(CONF_POWER_FACTOR_B): sensor.sensor_schema(
+            unit_of_measurement=UNIT_PERCENT,
+            accuracy_decimals=2,
+            device_class=DEVICE_CLASS_POWER_FACTOR,
+            state_class=STATE_CLASS_MEASUREMENT,
+        ),
+        cv.Optional(
+            CONF_VOLTAGE_PGA_GAIN,
+            default="1x",
+        ): cv.one_of(*PGA_GAINS, lower=True),
+        cv.Optional(
+            CONF_CURRENT_PGA_GAIN_A,
+            default="1x",
+        ): cv.one_of(*PGA_GAINS, lower=True),
+        cv.Optional(
+            CONF_CURRENT_PGA_GAIN_B,
+            default="1x",
+        ): cv.one_of(*PGA_GAINS, lower=True),
+        cv.Optional(CONF_VOLTAGE_GAIN, default=0x400000): cv.hex_int_range(
+            min=0x100000, max=0x800000
+        ),
+        cv.Optional(CONF_CURRENT_GAIN_A, default=0x400000): cv.hex_int_range(
+            min=0x100000, max=0x800000
+        ),
+        cv.Optional(CONF_CURRENT_GAIN_B, default=0x400000): cv.hex_int_range(
+            min=0x100000, max=0x800000
+        ),
+        cv.Optional(CONF_ACTIVE_POWER_GAIN_A, default=0x400000): cv.hex_int_range(
+            min=0x100000, max=0x800000
+        ),
+        cv.Optional(CONF_ACTIVE_POWER_GAIN_B, default=0x400000): cv.hex_int_range(
+            min=0x100000, max=0x800000
+        ),
+    }
+).extend(cv.polling_component_schema("60s"))
+
+
+async def register_ade7953(var, config):
+    await cg.register_component(var, config)
+
+    if irq_pin_config := config.get(CONF_IRQ_PIN):
+        irq_pin = await cg.gpio_pin_expression(irq_pin_config)
+        cg.add(var.set_irq_pin(irq_pin))
+
+    cg.add(var.set_pga_v(PGA_GAINS[config.get(CONF_VOLTAGE_PGA_GAIN)]))
+    cg.add(var.set_pga_ia(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_A)]))
+    cg.add(var.set_pga_ib(PGA_GAINS[config.get(CONF_CURRENT_PGA_GAIN_B)]))
+    cg.add(var.set_vgain(config.get(CONF_VOLTAGE_GAIN)))
+    cg.add(var.set_aigain(config.get(CONF_CURRENT_GAIN_A)))
+    cg.add(var.set_bigain(config.get(CONF_CURRENT_GAIN_B)))
+    cg.add(var.set_awgain(config.get(CONF_ACTIVE_POWER_GAIN_A)))
+    cg.add(var.set_bwgain(config.get(CONF_ACTIVE_POWER_GAIN_B)))
+
+    for key in [
+        CONF_VOLTAGE,
+        CONF_FREQUENCY,
+        CONF_CURRENT_A,
+        CONF_CURRENT_B,
+        CONF_POWER_FACTOR_A,
+        CONF_POWER_FACTOR_B,
+        CONF_APPARENT_POWER_A,
+        CONF_APPARENT_POWER_B,
+        CONF_ACTIVE_POWER_A,
+        CONF_ACTIVE_POWER_B,
+        CONF_REACTIVE_POWER_A,
+        CONF_REACTIVE_POWER_B,
+    ]:
+        if key not in config:
+            continue
+        conf = config[key]
+        sens = await sensor.new_sensor(conf)
+        cg.add(getattr(var, f"set_{key}_sensor")(sens))
diff --git a/esphome/components/ade7953_base/ade7953_base.cpp b/esphome/components/ade7953_base/ade7953_base.cpp
new file mode 100644
index 0000000000..af6fe0a5df
--- /dev/null
+++ b/esphome/components/ade7953_base/ade7953_base.cpp
@@ -0,0 +1,129 @@
+#include "ade7953_base.h"
+#include "esphome/core/log.h"
+
+namespace esphome {
+namespace ade7953_base {
+
+static const char *const TAG = "ade7953";
+
+void ADE7953::setup() {
+  if (this->irq_pin_ != nullptr) {
+    this->irq_pin_->setup();
+  }
+
+  // The chip might take up to 100ms to initialise
+  this->set_timeout(100, [this]() {
+    // this->ade_write_8(0x0010, 0x04);
+    this->ade_write_8(0x00FE, 0xAD);
+    this->ade_write_16(0x0120, 0x0030);
+    // Set gains
+    this->ade_write_8(PGA_V_8, pga_v_);
+    this->ade_write_8(PGA_IA_8, pga_ia_);
+    this->ade_write_8(PGA_IB_8, pga_ib_);
+    this->ade_write_32(AVGAIN_32, vgain_);
+    this->ade_write_32(AIGAIN_32, aigain_);
+    this->ade_write_32(BIGAIN_32, bigain_);
+    this->ade_write_32(AWGAIN_32, awgain_);
+    this->ade_write_32(BWGAIN_32, bwgain_);
+    // Read back gains for debugging
+    this->ade_read_8(PGA_V_8, &pga_v_);
+    this->ade_read_8(PGA_IA_8, &pga_ia_);
+    this->ade_read_8(PGA_IB_8, &pga_ib_);
+    this->ade_read_32(AVGAIN_32, &vgain_);
+    this->ade_read_32(AIGAIN_32, &aigain_);
+    this->ade_read_32(BIGAIN_32, &bigain_);
+    this->ade_read_32(AWGAIN_32, &awgain_);
+    this->ade_read_32(BWGAIN_32, &bwgain_);
+    this->is_setup_ = true;
+  });
+}
+
+void ADE7953::dump_config() {
+  LOG_PIN("  IRQ Pin: ", irq_pin_);
+  LOG_UPDATE_INTERVAL(this);
+  LOG_SENSOR("  ", "Voltage Sensor", this->voltage_sensor_);
+  LOG_SENSOR("  ", "Current A Sensor", this->current_a_sensor_);
+  LOG_SENSOR("  ", "Current B Sensor", this->current_b_sensor_);
+  LOG_SENSOR("  ", "Power Factor A Sensor", this->power_factor_a_sensor_);
+  LOG_SENSOR("  ", "Power Factor B Sensor", this->power_factor_b_sensor_);
+  LOG_SENSOR("  ", "Apparent Power A Sensor", this->apparent_power_a_sensor_);
+  LOG_SENSOR("  ", "Apparent Power B Sensor", this->apparent_power_b_sensor_);
+  LOG_SENSOR("  ", "Active Power A Sensor", this->active_power_a_sensor_);
+  LOG_SENSOR("  ", "Active Power B Sensor", this->active_power_b_sensor_);
+  LOG_SENSOR("  ", "Rective Power A Sensor", this->reactive_power_a_sensor_);
+  LOG_SENSOR("  ", "Reactive Power B Sensor", this->reactive_power_b_sensor_);
+  ESP_LOGCONFIG(TAG, "  PGA_V_8: 0x%X", pga_v_);
+  ESP_LOGCONFIG(TAG, "  PGA_IA_8: 0x%X", pga_ia_);
+  ESP_LOGCONFIG(TAG, "  PGA_IB_8: 0x%X", pga_ib_);
+  ESP_LOGCONFIG(TAG, "  VGAIN_32: 0x%08jX", (uintmax_t) vgain_);
+  ESP_LOGCONFIG(TAG, "  AIGAIN_32: 0x%08jX", (uintmax_t) aigain_);
+  ESP_LOGCONFIG(TAG, "  BIGAIN_32: 0x%08jX", (uintmax_t) bigain_);
+  ESP_LOGCONFIG(TAG, "  AWGAIN_32: 0x%08jX", (uintmax_t) awgain_);
+  ESP_LOGCONFIG(TAG, "  BWGAIN_32: 0x%08jX", (uintmax_t) bwgain_);
+}
+
+#define ADE_PUBLISH_(name, val, factor) \
+  if (err == 0 && this->name##_sensor_) { \
+    float value = (val) / (factor); \
+    this->name##_sensor_->publish_state(value); \
+  }
+#define ADE_PUBLISH(name, val, factor) ADE_PUBLISH_(name, val, factor)
+
+void ADE7953::update() {
+  if (!this->is_setup_)
+    return;
+
+  bool err;
+
+  uint32_t interrupts_a = 0;
+  uint32_t interrupts_b = 0;
+  if (this->irq_pin_ != nullptr) {
+    // Read and reset interrupts
+    this->ade_read_32(0x032E, &interrupts_a);
+    this->ade_read_32(0x0331, &interrupts_b);
+  }
+
+  uint32_t val;
+  uint16_t val_16;
+
+  // Power factor
+  err = this->ade_read_16(0x010A, &val_16);
+  ADE_PUBLISH(power_factor_a, (int16_t) val_16, (0x7FFF / 100.0f));
+  err = this->ade_read_16(0x010B, &val_16);
+  ADE_PUBLISH(power_factor_b, (int16_t) val_16, (0x7FFF / 100.0f));
+
+  // Apparent power
+  err = this->ade_read_32(0x0310, &val);
+  ADE_PUBLISH(apparent_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(0x0311, &val);
+  ADE_PUBLISH(apparent_power_b, (int32_t) val, 154.0f);
+
+  // Active power
+  err = this->ade_read_32(0x0312, &val);
+  ADE_PUBLISH(active_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(0x0313, &val);
+  ADE_PUBLISH(active_power_b, (int32_t) val, 154.0f);
+
+  // Reactive power
+  err = this->ade_read_32(0x0314, &val);
+  ADE_PUBLISH(reactive_power_a, (int32_t) val, 154.0f);
+  err = this->ade_read_32(0x0315, &val);
+  ADE_PUBLISH(reactive_power_b, (int32_t) val, 154.0f);
+
+  // Current
+  err = this->ade_read_32(0x031A, &val);
+  ADE_PUBLISH(current_a, (uint32_t) val, 100000.0f);
+  err = this->ade_read_32(0x031B, &val);
+  ADE_PUBLISH(current_b, (uint32_t) val, 100000.0f);
+
+  // Voltage
+  err = this->ade_read_32(0x031C, &val);
+  ADE_PUBLISH(voltage, (uint32_t) val, 26000.0f);
+
+  // Frequency
+  err = this->ade_read_16(0x010E, &val_16);
+  ADE_PUBLISH(frequency, 223750.0f, 1 + val_16);
+}
+
+}  // namespace ade7953_base
+}  // namespace esphome
diff --git a/esphome/components/ade7953_base/ade7953_base.h b/esphome/components/ade7953_base/ade7953_base.h
new file mode 100644
index 0000000000..f57a8aa1df
--- /dev/null
+++ b/esphome/components/ade7953_base/ade7953_base.h
@@ -0,0 +1,121 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/sensor/sensor.h"
+
+#include <vector>
+
+namespace esphome {
+namespace ade7953_base {
+
+static const uint8_t PGA_V_8 =
+    0x007;  // PGA_V,  (R/W) Default: 0x00, Unsigned, Voltage channel gain configuration (Bits[2:0])
+static const uint8_t PGA_IA_8 =
+    0x008;  // PGA_IA, (R/W) Default: 0x00, Unsigned, Current Channel A gain configuration (Bits[2:0])
+static const uint8_t PGA_IB_8 =
+    0x009;  // PGA_IB, (R/W) Default: 0x00, Unsigned, Current Channel B gain configuration (Bits[2:0])
+
+static const uint32_t AIGAIN_32 =
+    0x380;  // AIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel A)(32 bit)
+static const uint32_t AVGAIN_32 = 0x381;  // AVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
+static const uint32_t AWGAIN_32 =
+    0x382;  // AWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel A)(32 bit)
+static const uint32_t AVARGAIN_32 =
+    0x383;  // AVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel A)(32 bit)
+static const uint32_t AVAGAIN_32 =
+    0x384;  // AVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel A)(32 bit)
+
+static const uint32_t BIGAIN_32 =
+    0x38C;  // BIGAIN, (R/W)   Default: 0x400000, Unsigned,Current channel gain (Current Channel B)(32 bit)
+static const uint32_t BVGAIN_32 = 0x38D;  // BVGAIN, (R/W)   Default: 0x400000, Unsigned,Voltage channel gain(32 bit)
+static const uint32_t BWGAIN_32 =
+    0x38E;  // BWGAIN, (R/W)   Default: 0x400000, Unsigned,Active power gain (Current Channel B)(32 bit)
+static const uint32_t BVARGAIN_32 =
+    0x38F;  // BVARGAIN, (R/W) Default: 0x400000, Unsigned, Reactive power gain (Current Channel B)(32 bit)
+static const uint32_t BVAGAIN_32 =
+    0x390;  // BVAGAIN, (R/W)  Default: 0x400000, Unsigned,Apparent power gain (Current Channel B)(32 bit)
+
+class ADE7953 : public PollingComponent, public sensor::Sensor {
+ public:
+  void set_irq_pin(InternalGPIOPin *irq_pin) { irq_pin_ = irq_pin; }
+
+  // Set PGA input gains: 0 1x, 1 2x, 0b10 4x
+  void set_pga_v(uint8_t pga_v) { pga_v_ = pga_v; }
+  void set_pga_ia(uint8_t pga_ia) { pga_ia_ = pga_ia; }
+  void set_pga_ib(uint8_t pga_ib) { pga_ib_ = pga_ib; }
+
+  // Set input gains
+  void set_vgain(uint32_t vgain) { vgain_ = vgain; }
+  void set_aigain(uint32_t aigain) { aigain_ = aigain; }
+  void set_bigain(uint32_t bigain) { bigain_ = bigain; }
+  void set_awgain(uint32_t awgain) { awgain_ = awgain; }
+  void set_bwgain(uint32_t bwgain) { bwgain_ = bwgain; }
+
+  void set_voltage_sensor(sensor::Sensor *voltage_sensor) { voltage_sensor_ = voltage_sensor; }
+  void set_frequency_sensor(sensor::Sensor *frequency_sensor) { frequency_sensor_ = frequency_sensor; }
+
+  void set_power_factor_a_sensor(sensor::Sensor *power_factor_a) { power_factor_a_sensor_ = power_factor_a; }
+  void set_power_factor_b_sensor(sensor::Sensor *power_factor_b) { power_factor_b_sensor_ = power_factor_b; }
+
+  void set_current_a_sensor(sensor::Sensor *current_a_sensor) { current_a_sensor_ = current_a_sensor; }
+  void set_current_b_sensor(sensor::Sensor *current_b_sensor) { current_b_sensor_ = current_b_sensor; }
+
+  void set_apparent_power_a_sensor(sensor::Sensor *apparent_power_a) { apparent_power_a_sensor_ = apparent_power_a; }
+  void set_apparent_power_b_sensor(sensor::Sensor *apparent_power_b) { apparent_power_b_sensor_ = apparent_power_b; }
+
+  void set_active_power_a_sensor(sensor::Sensor *active_power_a_sensor) {
+    active_power_a_sensor_ = active_power_a_sensor;
+  }
+  void set_active_power_b_sensor(sensor::Sensor *active_power_b_sensor) {
+    active_power_b_sensor_ = active_power_b_sensor;
+  }
+
+  void set_reactive_power_a_sensor(sensor::Sensor *reactive_power_a) { reactive_power_a_sensor_ = reactive_power_a; }
+  void set_reactive_power_b_sensor(sensor::Sensor *reactive_power_b) { reactive_power_b_sensor_ = reactive_power_b; }
+
+  void setup() override;
+
+  void dump_config() override;
+
+  void update() override;
+
+ protected:
+  InternalGPIOPin *irq_pin_{nullptr};
+  bool is_setup_{false};
+  sensor::Sensor *voltage_sensor_{nullptr};
+  sensor::Sensor *frequency_sensor_{nullptr};
+  sensor::Sensor *current_a_sensor_{nullptr};
+  sensor::Sensor *current_b_sensor_{nullptr};
+  sensor::Sensor *apparent_power_a_sensor_{nullptr};
+  sensor::Sensor *apparent_power_b_sensor_{nullptr};
+  sensor::Sensor *active_power_a_sensor_{nullptr};
+  sensor::Sensor *active_power_b_sensor_{nullptr};
+  sensor::Sensor *reactive_power_a_sensor_{nullptr};
+  sensor::Sensor *reactive_power_b_sensor_{nullptr};
+  sensor::Sensor *power_factor_a_sensor_{nullptr};
+  sensor::Sensor *power_factor_b_sensor_{nullptr};
+  uint8_t pga_v_;
+  uint8_t pga_ia_;
+  uint8_t pga_ib_;
+  uint32_t vgain_;
+  uint32_t aigain_;
+  uint32_t bigain_;
+  uint32_t awgain_;
+  uint32_t bwgain_;
+
+  virtual bool ade_write_8(uint16_t reg, uint8_t value) = 0;
+
+  virtual bool ade_write_16(uint16_t reg, uint16_t value) = 0;
+
+  virtual bool ade_write_32(uint16_t reg, uint32_t value) = 0;
+
+  virtual bool ade_read_8(uint16_t reg, uint8_t *value) = 0;
+
+  virtual bool ade_read_16(uint16_t reg, uint16_t *value) = 0;
+
+  virtual bool ade_read_32(uint16_t reg, uint32_t *value) = 0;
+};
+
+}  // namespace ade7953_base
+}  // namespace esphome
diff --git a/esphome/components/ade7953_i2c/__init__.py b/esphome/components/ade7953_i2c/__init__.py
new file mode 100644
index 0000000000..d3078a0b67
--- /dev/null
+++ b/esphome/components/ade7953_i2c/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@angelnu"]
diff --git a/esphome/components/ade7953_i2c/ade7953_i2c.cpp b/esphome/components/ade7953_i2c/ade7953_i2c.cpp
new file mode 100644
index 0000000000..572337428a
--- /dev/null
+++ b/esphome/components/ade7953_i2c/ade7953_i2c.cpp
@@ -0,0 +1,80 @@
+#include "ade7953_i2c.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ade7953_i2c {
+
+static const char *const TAG = "ade7953";
+
+void AdE7953I2c::dump_config() {
+  ESP_LOGCONFIG(TAG, "ADE7953_i2c:");
+  LOG_I2C_DEVICE(this);
+  ade7953_base::ADE7953::dump_config();
+}
+bool AdE7953I2c::ade_write_8(uint16_t reg, uint8_t value) {
+  std::vector<uint8_t> data(3);
+  data.push_back(reg >> 8);
+  data.push_back(reg >> 0);
+  data.push_back(value);
+  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+}
+bool AdE7953I2c::ade_write_16(uint16_t reg, uint16_t value) {
+  std::vector<uint8_t> data(4);
+  data.push_back(reg >> 8);
+  data.push_back(reg >> 0);
+  data.push_back(value >> 8);
+  data.push_back(value >> 0);
+  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+}
+bool AdE7953I2c::ade_write_32(uint16_t reg, uint32_t value) {
+  std::vector<uint8_t> data(6);
+  data.push_back(reg >> 8);
+  data.push_back(reg >> 0);
+  data.push_back(value >> 24);
+  data.push_back(value >> 16);
+  data.push_back(value >> 8);
+  data.push_back(value >> 0);
+  return this->write(data.data(), data.size()) != i2c::ERROR_OK;
+}
+bool AdE7953I2c::ade_read_8(uint16_t reg, uint8_t *value) {
+  uint8_t reg_data[2];
+  reg_data[0] = reg >> 8;
+  reg_data[1] = reg >> 0;
+  i2c::ErrorCode err = this->write(reg_data, 2);
+  if (err != i2c::ERROR_OK)
+    return true;
+  err = this->read(value, 1);
+  return (err != i2c::ERROR_OK);
+}
+bool AdE7953I2c::ade_read_16(uint16_t reg, uint16_t *value) {
+  uint8_t reg_data[2];
+  reg_data[0] = reg >> 8;
+  reg_data[1] = reg >> 0;
+  i2c::ErrorCode err = this->write(reg_data, 2);
+  if (err != i2c::ERROR_OK)
+    return true;
+  uint8_t recv[2];
+  err = this->read(recv, 2);
+  if (err != i2c::ERROR_OK)
+    return true;
+  *value = encode_uint16(recv[0], recv[1]);
+  return false;
+}
+bool AdE7953I2c::ade_read_32(uint16_t reg, uint32_t *value) {
+  uint8_t reg_data[2];
+  reg_data[0] = reg >> 8;
+  reg_data[1] = reg >> 0;
+  i2c::ErrorCode err = this->write(reg_data, 2);
+  if (err != i2c::ERROR_OK)
+    return true;
+  uint8_t recv[4];
+  err = this->read(recv, 4);
+  if (err != i2c::ERROR_OK)
+    return true;
+  *value = encode_uint32(recv[0], recv[1], recv[2], recv[3]);
+  return false;
+}
+
+}  // namespace ade7953_i2c
+}  // namespace esphome
diff --git a/esphome/components/ade7953_i2c/ade7953_i2c.h b/esphome/components/ade7953_i2c/ade7953_i2c.h
new file mode 100644
index 0000000000..65dc30dddb
--- /dev/null
+++ b/esphome/components/ade7953_i2c/ade7953_i2c.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/i2c/i2c.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/ade7953_base/ade7953_base.h"
+
+#include <vector>
+
+namespace esphome {
+namespace ade7953_i2c {
+
+class AdE7953I2c : public ade7953_base::ADE7953, public i2c::I2CDevice {
+ public:
+  void dump_config() override;
+
+ protected:
+  bool ade_write_8(uint16_t reg, uint8_t value) override;
+  bool ade_write_16(uint16_t reg, uint16_t value) override;
+  bool ade_write_32(uint16_t reg, uint32_t value) override;
+  bool ade_read_8(uint16_t reg, uint8_t *value) override;
+  bool ade_read_16(uint16_t reg, uint16_t *value) override;
+  bool ade_read_32(uint16_t reg, uint32_t *value) override;
+};
+
+}  // namespace ade7953_i2c
+}  // namespace esphome
diff --git a/esphome/components/ade7953_i2c/sensor.py b/esphome/components/ade7953_i2c/sensor.py
new file mode 100644
index 0000000000..e52a44eced
--- /dev/null
+++ b/esphome/components/ade7953_i2c/sensor.py
@@ -0,0 +1,27 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import i2c, ade7953_base
+from esphome.const import CONF_ID
+
+
+DEPENDENCIES = ["i2c"]
+AUTO_LOAD = ["ade7953_base"]
+
+ade7953_ns = cg.esphome_ns.namespace("ade7953_i2c")
+ADE7953 = ade7953_ns.class_("AdE7953I2c", ade7953_base.ADE7953, i2c.I2CDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ADE7953),
+        }
+    )
+    .extend(ade7953_base.ADE7953_CONFIG_SCHEMA)
+    .extend(i2c.i2c_device_schema(0x38))
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await i2c.register_i2c_device(var, config)
+    await ade7953_base.register_ade7953(var, config)
diff --git a/esphome/components/ade7953_spi/__init__.py b/esphome/components/ade7953_spi/__init__.py
new file mode 100644
index 0000000000..d3078a0b67
--- /dev/null
+++ b/esphome/components/ade7953_spi/__init__.py
@@ -0,0 +1 @@
+CODEOWNERS = ["@angelnu"]
diff --git a/esphome/components/ade7953_spi/ade7953_spi.cpp b/esphome/components/ade7953_spi/ade7953_spi.cpp
new file mode 100644
index 0000000000..cfd5d71d0a
--- /dev/null
+++ b/esphome/components/ade7953_spi/ade7953_spi.cpp
@@ -0,0 +1,81 @@
+#include "ade7953_spi.h"
+#include "esphome/core/log.h"
+#include "esphome/core/helpers.h"
+
+namespace esphome {
+namespace ade7953_spi {
+
+static const char *const TAG = "ade7953";
+
+void AdE7953Spi::setup() {
+  this->spi_setup();
+  ade7953_base::ADE7953::setup();
+}
+
+void AdE7953Spi::dump_config() {
+  ESP_LOGCONFIG(TAG, "ADE7953_spi:");
+  LOG_PIN("  CS Pin: ", this->cs_);
+  ade7953_base::ADE7953::dump_config();
+}
+
+bool AdE7953Spi::ade_write_8(uint16_t reg, uint8_t value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0);
+  this->transfer_byte(value);
+  this->disable();
+  return false;
+}
+
+bool AdE7953Spi::ade_write_16(uint16_t reg, uint16_t value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0);
+  this->write_byte16(value);
+  this->disable();
+  return false;
+}
+
+bool AdE7953Spi::ade_write_32(uint16_t reg, uint32_t value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0);
+  this->write_byte16(value >> 16);
+  this->write_byte16(value & 0xFFFF);
+  this->disable();
+  return false;
+}
+
+bool AdE7953Spi::ade_read_8(uint16_t reg, uint8_t *value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0x80);
+  *value = this->read_byte();
+  this->disable();
+  return false;
+}
+
+bool AdE7953Spi::ade_read_16(uint16_t reg, uint16_t *value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0x80);
+  uint8_t recv[2];
+  this->read_array(recv, 4);
+  *value = encode_uint16(recv[0], recv[1]);
+  this->disable();
+  return false;
+}
+
+bool AdE7953Spi::ade_read_32(uint16_t reg, uint32_t *value) {
+  this->enable();
+  this->write_byte16(reg);
+  this->transfer_byte(0x80);
+  uint8_t recv[4];
+  this->read_array(recv, 4);
+  *value = encode_uint32(recv[0], recv[1], recv[2], recv[3]);
+  this->disable();
+  return false;
+}
+
+}  // namespace ade7953_spi
+}  // namespace esphome
diff --git a/esphome/components/ade7953_spi/ade7953_spi.h b/esphome/components/ade7953_spi/ade7953_spi.h
new file mode 100644
index 0000000000..d96852b9bb
--- /dev/null
+++ b/esphome/components/ade7953_spi/ade7953_spi.h
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "esphome/core/component.h"
+#include "esphome/core/hal.h"
+#include "esphome/components/spi/spi.h"
+#include "esphome/components/sensor/sensor.h"
+#include "esphome/components/ade7953_base/ade7953_base.h"
+
+#include <vector>
+
+namespace esphome {
+namespace ade7953_spi {
+
+class AdE7953Spi : public ade7953_base::ADE7953,
+                   public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_HIGH, spi::CLOCK_PHASE_LEADING,
+                                         spi::DATA_RATE_1MHZ> {
+ public:
+  void setup() override;
+
+  void dump_config() override;
+
+ protected:
+  bool ade_write_8(uint16_t reg, uint8_t value) override;
+  bool ade_write_16(uint16_t reg, uint16_t value) override;
+  bool ade_write_32(uint16_t reg, uint32_t value) override;
+  bool ade_read_8(uint16_t reg, uint8_t *value) override;
+  bool ade_read_16(uint16_t reg, uint16_t *value) override;
+  bool ade_read_32(uint16_t reg, uint32_t *value) override;
+};
+
+}  // namespace ade7953_spi
+}  // namespace esphome
diff --git a/esphome/components/ade7953_spi/sensor.py b/esphome/components/ade7953_spi/sensor.py
new file mode 100644
index 0000000000..5f9682c711
--- /dev/null
+++ b/esphome/components/ade7953_spi/sensor.py
@@ -0,0 +1,27 @@
+import esphome.codegen as cg
+import esphome.config_validation as cv
+from esphome.components import spi, ade7953_base
+from esphome.const import CONF_ID
+
+
+DEPENDENCIES = ["spi"]
+AUTO_LOAD = ["ade7953_base"]
+
+ade7953_ns = cg.esphome_ns.namespace("ade7953_spi")
+ADE7953 = ade7953_ns.class_("AdE7953Spi", ade7953_base.ADE7953, spi.SPIDevice)
+
+CONFIG_SCHEMA = (
+    cv.Schema(
+        {
+            cv.GenerateID(): cv.declare_id(ADE7953),
+        }
+    )
+    .extend(ade7953_base.ADE7953_CONFIG_SCHEMA)
+    .extend(spi.spi_device_schema())
+)
+
+
+async def to_code(config):
+    var = cg.new_Pvariable(config[CONF_ID])
+    await spi.register_spi_device(var, config)
+    await ade7953_base.register_ade7953(var, config)
diff --git a/tests/test11.5.yaml b/tests/test11.5.yaml
index 9b25b9f273..685487e871 100644
--- a/tests/test11.5.yaml
+++ b/tests/test11.5.yaml
@@ -51,6 +51,15 @@ uart:
 i2c:
   frequency: 100khz
 
+spi:
+  - id: spi_1
+    clk_pin: 12
+    mosi_pin: 13
+    miso_pin: 14
+  - id: spi_2
+    clk_pin: 32
+    mosi_pin: 33
+
 modbus:
   uart_id: uart_1
   flow_control_pin: 5
@@ -574,6 +583,60 @@ sensor:
     temperature:
       name: Kuntze temperature
 
+  - platform: ade7953_i2c
+    irq_pin: 16
+    voltage:
+      name: ADE7953 Voltage
+    current_a:
+      name: ADE7953 Current A
+    current_b:
+      name: ADE7953 Current B
+    power_factor_a:
+      name: "ADE7953 Power Factor A"
+    power_factor_b:
+      name: "ADE7953 Power Factor B"
+    apparent_power_a:
+      name: "ADE7953 Apparent Power A"
+    apparent_power_b:
+      name: "ADE7953 Apparent Power B"
+    active_power_a:
+      name: ADE7953 Active Power A
+    active_power_b:
+      name: ADE7953 Active Power B
+    reactive_power_a:
+      name: "ADE7953 Reactive Power A"
+    reactive_power_b:
+      name: "ADE7953 Reactive Power B"
+    update_interval: 1s
+
+  - platform: ade7953_spi
+    spi_id: spi_1
+    cs_pin: 04
+    irq_pin: 16
+    voltage:
+      name: ADE7953 Voltage
+    current_a:
+      name: ADE7953 Current A
+    current_b:
+      name: ADE7953 Current B
+    power_factor_a:
+      name: "ADE7953 Power Factor A"
+    power_factor_b:
+      name: "ADE7953 Power Factor B"
+    apparent_power_a:
+      name: "ADE7953 Apparent Power A"
+    apparent_power_b:
+      name: "ADE7953 Apparent Power B"
+    active_power_a:
+      name: ADE7953 Active Power A
+    active_power_b:
+      name: ADE7953 Active Power B
+    reactive_power_a:
+      name: "ADE7953 Reactive Power A"
+    reactive_power_b:
+      name: "ADE7953 Reactive Power B"
+    update_interval: 1s
+
 script:
   - id: automation_test
     then:
diff --git a/tests/test3.1.yaml b/tests/test3.1.yaml
index 8884479f61..151e53fd62 100644
--- a/tests/test3.1.yaml
+++ b/tests/test3.1.yaml
@@ -169,7 +169,7 @@ sensor:
       - id: custom_sensor
         name: Custom Sensor
 
-  - platform: ade7953
+  - platform: ade7953_i2c
     irq_pin: GPIO16
     voltage:
       name: ADE7953 Voltage
@@ -180,12 +180,50 @@ sensor:
     current_b:
       name: ADE7953 Current B
       id: ade7953_current_b
+    power_factor_a:
+      name: "ADE7953 Power Factor A"
+    power_factor_b:
+      name: "ADE7953 Power Factor B"
+    apparent_power_a:
+      name: "ADE7953 Apparent Power A"
+    apparent_power_b:
+      name: "ADE7953 Apparent Power B"
     active_power_a:
       name: ADE7953 Active Power A
-      id: ade7953_active_power_a
     active_power_b:
       name: ADE7953 Active Power B
-      id: ade7953_active_power_b
+    reactive_power_a:
+      name: "ADE7953 Reactive Power A"
+    reactive_power_b:
+      name: "ADE7953 Reactive Power B"
+    update_interval: 1s
+
+  - platform: ade7953_spi
+    cs_pin: GPIO04
+    irq_pin: GPIO16
+    voltage:
+      name: ADE7953 Voltage
+    current_a:
+      name: ADE7953 Current A
+    current_b:
+      name: ADE7953 Current B
+    power_factor_a:
+      name: "ADE7953 Power Factor A"
+    power_factor_b:
+      name: "ADE7953 Power Factor B"
+    apparent_power_a:
+      name: "ADE7953 Apparent Power A"
+    apparent_power_b:
+      name: "ADE7953 Apparent Power B"
+    active_power_a:
+      name: ADE7953 Active Power A
+    active_power_b:
+      name: ADE7953 Active Power B
+    reactive_power_a:
+      name: "ADE7953 Reactive Power A"
+    reactive_power_b:
+      name: "ADE7953 Reactive Power B"
+    update_interval: 1s
 
   - platform: tmp102
     name: TMP102 Temperature

From a8a9c6192da1cc48f3488861e82b16bf084f1ebf Mon Sep 17 00:00:00 2001
From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com>
Date: Tue, 7 Nov 2023 01:48:15 +0100
Subject: [PATCH 123/131] Remove page jump on Nextion startup (#5673)

---
 esphome/components/nextion/base_component.py  |  1 +
 esphome/components/nextion/display.py         |  5 ++++
 esphome/components/nextion/nextion.cpp        | 10 ++++++-
 esphome/components/nextion/nextion.h          | 28 +++++++++++++++++++
 .../components/nextion/nextion_commands.cpp   |  3 ++
 5 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/esphome/components/nextion/base_component.py b/esphome/components/nextion/base_component.py
index b2a857c888..f1c3a1d227 100644
--- a/esphome/components/nextion/base_component.py
+++ b/esphome/components/nextion/base_component.py
@@ -21,6 +21,7 @@ CONF_ON_SETUP = "on_setup"
 CONF_ON_PAGE = "on_page"
 CONF_TOUCH_SLEEP_TIMEOUT = "touch_sleep_timeout"
 CONF_WAKE_UP_PAGE = "wake_up_page"
+CONF_START_UP_PAGE = "start_up_page"
 CONF_AUTO_WAKE_ON_TOUCH = "auto_wake_on_touch"
 CONF_WAVE_MAX_LENGTH = "wave_max_length"
 CONF_BACKGROUND_COLOR = "background_color"
diff --git a/esphome/components/nextion/display.py b/esphome/components/nextion/display.py
index 72f56bd6f3..afb64ceeea 100644
--- a/esphome/components/nextion/display.py
+++ b/esphome/components/nextion/display.py
@@ -18,6 +18,7 @@ from .base_component import (
     CONF_TFT_URL,
     CONF_TOUCH_SLEEP_TIMEOUT,
     CONF_WAKE_UP_PAGE,
+    CONF_START_UP_PAGE,
     CONF_AUTO_WAKE_ON_TOUCH,
 )
 
@@ -59,6 +60,7 @@ CONFIG_SCHEMA = (
             ),
             cv.Optional(CONF_TOUCH_SLEEP_TIMEOUT): cv.int_range(min=3, max=65535),
             cv.Optional(CONF_WAKE_UP_PAGE): cv.positive_int,
+            cv.Optional(CONF_START_UP_PAGE): cv.positive_int,
             cv.Optional(CONF_AUTO_WAKE_ON_TOUCH, default=True): cv.boolean,
         }
     )
@@ -95,6 +97,9 @@ async def to_code(config):
     if CONF_WAKE_UP_PAGE in config:
         cg.add(var.set_wake_up_page_internal(config[CONF_WAKE_UP_PAGE]))
 
+    if CONF_START_UP_PAGE in config:
+        cg.add(var.set_start_up_page_internal(config[CONF_START_UP_PAGE]))
+
     if CONF_AUTO_WAKE_ON_TOUCH in config:
         cg.add(var.set_auto_wake_on_touch_internal(config[CONF_AUTO_WAKE_ON_TOUCH]))
 
diff --git a/esphome/components/nextion/nextion.cpp b/esphome/components/nextion/nextion.cpp
index 78c07be890..76bdb283f6 100644
--- a/esphome/components/nextion/nextion.cpp
+++ b/esphome/components/nextion/nextion.cpp
@@ -134,6 +134,10 @@ void Nextion::dump_config() {
   if (this->wake_up_page_ != -1) {
     ESP_LOGCONFIG(TAG, "  Wake Up Page :       %d", this->wake_up_page_);
   }
+
+  if (this->start_up_page_ != -1) {
+    ESP_LOGCONFIG(TAG, "  Start Up Page :      %d", this->start_up_page_);
+  }
 }
 
 float Nextion::get_setup_priority() const { return setup_priority::DATA; }
@@ -231,7 +235,11 @@ void Nextion::loop() {
     this->send_command_("bkcmd=3");  // Always, returns 0x00 to 0x23 result of serial command.
 
     this->set_backlight_brightness(this->brightness_);
-    this->goto_page("0");
+
+    // Check if a startup page has been set and send the command
+    if (this->start_up_page_ != -1) {
+      this->goto_page(this->start_up_page_);
+    }
 
     this->set_auto_wake_on_touch(this->auto_wake_on_touch_);
 
diff --git a/esphome/components/nextion/nextion.h b/esphome/components/nextion/nextion.h
index 92ff3fe235..7b5641b711 100644
--- a/esphome/components/nextion/nextion.h
+++ b/esphome/components/nextion/nextion.h
@@ -334,6 +334,18 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    * Switches to the page named `main`. Pages are named in the Nextion Editor.
    */
   void goto_page(const char *page);
+  /**
+   * Show the page with a given id.
+   * @param page The id of the page.
+   *
+   * Example:
+   * ```cpp
+   * it.goto_page(2);
+   * ```
+   *
+   * Switches to the page named `main`. Pages are named in the Nextion Editor.
+   */
+  void goto_page(uint8_t page);
   /**
    * Hide a component.
    * @param component The component name.
@@ -605,6 +617,20 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
    * The display will wake up to page 2.
    */
   void set_wake_up_page(uint8_t page_id = 255);
+  /**
+   * Sets which page Nextion loads when connecting to ESPHome.
+   * @param page_id The page id, from 0 to the lage page in Nextion. Set 255 (not set to any existing page) to
+   * wakes up to current page.
+   *
+   * Example:
+   * ```cpp
+   * it.set_start_up_page(2);
+   * ```
+   *
+   * The display will go to page 2 when it establishes a connection to ESPHome.
+   */
+  void set_start_up_page(uint8_t page_id = 255);
+
   /**
    * Sets if Nextion should auto-wake from sleep when touch press occurs.
    * @param auto_wake True or false. When auto_wake is true and Nextion is in sleep mode,
@@ -736,6 +762,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
     this->touch_sleep_timeout_ = touch_sleep_timeout;
   }
   void set_wake_up_page_internal(uint8_t wake_up_page) { this->wake_up_page_ = wake_up_page; }
+  void set_start_up_page_internal(uint8_t start_up_page) { this->start_up_page_ = start_up_page; }
   void set_auto_wake_on_touch_internal(bool auto_wake_on_touch) { this->auto_wake_on_touch_ = auto_wake_on_touch; }
 
  protected:
@@ -758,6 +785,7 @@ class Nextion : public NextionBase, public PollingComponent, public uart::UARTDe
   bool is_updating_ = false;
   uint32_t touch_sleep_timeout_ = 0;
   int wake_up_page_ = -1;
+  int start_up_page_ = -1;
   bool auto_wake_on_touch_ = true;
 
   /**
diff --git a/esphome/components/nextion/nextion_commands.cpp b/esphome/components/nextion/nextion_commands.cpp
index c4caf29287..a3157c731a 100644
--- a/esphome/components/nextion/nextion_commands.cpp
+++ b/esphome/components/nextion/nextion_commands.cpp
@@ -13,6 +13,8 @@ void Nextion::set_wake_up_page(uint8_t page_id) {
   this->add_no_result_to_queue_with_set_internal_("wake_up_page", "wup", page_id, true);
 }
 
+void Nextion::set_start_up_page(uint8_t page_id) { this->start_up_page_ = page_id; }
+
 void Nextion::set_touch_sleep_timeout(uint16_t timeout) {
   if (timeout < 3) {
     ESP_LOGD(TAG, "Sleep timeout out of bounds, range 3-65535");
@@ -124,6 +126,7 @@ void Nextion::set_component_text_printf(const char *component, const char *forma
 
 // General Nextion
 void Nextion::goto_page(const char *page) { this->add_no_result_to_queue_with_printf_("goto_page", "page %s", page); }
+void Nextion::goto_page(uint8_t page) { this->add_no_result_to_queue_with_printf_("goto_page", "page %i", page); }
 
 void Nextion::set_backlight_brightness(float brightness) {
   if (brightness < 0 || brightness > 1.0) {

From 708ed8f38a6f9c0e71f903af9c9314b7f0a89310 Mon Sep 17 00:00:00 2001
From: Daniel Baulig <me@danielbaulig.de>
Date: Mon, 6 Nov 2023 16:59:03 -0800
Subject: [PATCH 124/131] [web_server] Adds the ability to handle Private
 Network Access preflight requests (#5669)

---
 esphome/components/web_server/__init__.py     |  4 ++
 esphome/components/web_server/web_server.cpp  | 37 +++++++++++++++++++
 esphome/components/web_server/web_server.h    |  5 +++
 .../web_server_idf/web_server_idf.cpp         | 14 +++++++
 .../web_server_idf/web_server_idf.h           |  3 ++
 esphome/const.py                              |  1 +
 6 files changed, 64 insertions(+)

diff --git a/esphome/components/web_server/__init__.py b/esphome/components/web_server/__init__.py
index b8698438e2..2708b5d06e 100644
--- a/esphome/components/web_server/__init__.py
+++ b/esphome/components/web_server/__init__.py
@@ -9,6 +9,7 @@ from esphome.const import (
     CONF_ID,
     CONF_JS_INCLUDE,
     CONF_JS_URL,
+    CONF_ENABLE_PRIVATE_NETWORK_ACCESS,
     CONF_PORT,
     CONF_AUTH,
     CONF_USERNAME,
@@ -68,6 +69,7 @@ CONFIG_SCHEMA = cv.All(
             cv.Optional(CONF_CSS_INCLUDE): cv.file_,
             cv.Optional(CONF_JS_URL): cv.string,
             cv.Optional(CONF_JS_INCLUDE): cv.file_,
+            cv.Optional(CONF_ENABLE_PRIVATE_NETWORK_ACCESS, default=True): cv.boolean,
             cv.Optional(CONF_AUTH): cv.Schema(
                 {
                     cv.Required(CONF_USERNAME): cv.All(
@@ -158,6 +160,8 @@ async def to_code(config):
         cg.add(var.set_js_url(config[CONF_JS_URL]))
     cg.add(var.set_allow_ota(config[CONF_OTA]))
     cg.add(var.set_expose_log(config[CONF_LOG]))
+    if config[CONF_ENABLE_PRIVATE_NETWORK_ACCESS]:
+        cg.add_define("USE_WEBSERVER_PRIVATE_NETWORK_ACCESS")
     if CONF_AUTH in config:
         cg.add(paren.set_auth_username(config[CONF_AUTH][CONF_USERNAME]))
         cg.add(paren.set_auth_password(config[CONF_AUTH][CONF_PASSWORD]))
diff --git a/esphome/components/web_server/web_server.cpp b/esphome/components/web_server/web_server.cpp
index ccc86e5e53..0d72e274cd 100644
--- a/esphome/components/web_server/web_server.cpp
+++ b/esphome/components/web_server/web_server.cpp
@@ -34,6 +34,13 @@ namespace web_server {
 
 static const char *const TAG = "web_server";
 
+#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
+static const char *const HEADER_PNA_NAME = "Private-Network-Access-Name";
+static const char *const HEADER_PNA_ID = "Private-Network-Access-ID";
+static const char *const HEADER_CORS_REQ_PNA = "Access-Control-Request-Private-Network";
+static const char *const HEADER_CORS_ALLOW_PNA = "Access-Control-Allow-Private-Network";
+#endif
+
 #if USE_WEBSERVER_VERSION == 1
 void write_row(AsyncResponseStream *stream, EntityBase *obj, const std::string &klass, const std::string &action,
                const std::function<void(AsyncResponseStream &stream, EntityBase *obj)> &action_func = nullptr) {
@@ -359,6 +366,17 @@ void WebServer::handle_index_request(AsyncWebServerRequest *request) {
 }
 #endif
 
+#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
+void WebServer::handle_pna_cors_request(AsyncWebServerRequest *request) {
+  AsyncWebServerResponse *response = request->beginResponse(200, "");
+  response->addHeader(HEADER_CORS_ALLOW_PNA, "true");
+  response->addHeader(HEADER_PNA_NAME, App.get_name().c_str());
+  std::string mac = get_mac_address_pretty();
+  response->addHeader(HEADER_PNA_ID, mac.c_str());
+  request->send(response);
+}
+#endif
+
 #ifdef USE_WEBSERVER_CSS_INCLUDE
 void WebServer::handle_css_request(AsyncWebServerRequest *request) {
   AsyncWebServerResponse *response =
@@ -1145,6 +1163,18 @@ bool WebServer::canHandle(AsyncWebServerRequest *request) {
     return true;
 #endif
 
+#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
+  if (request->method() == HTTP_OPTIONS && request->hasHeader(HEADER_CORS_REQ_PNA)) {
+#ifdef USE_ARDUINO
+    // Header needs to be added to interesting header list for it to not be
+    // nuked by the time we handle the request later.
+    // Only required in Arduino framework.
+    request->addInterestingHeader(HEADER_CORS_REQ_PNA);
+#endif
+    return true;
+  }
+#endif
+
   UrlMatch match = match_url(request->url().c_str(), true);
   if (!match.valid)
     return false;
@@ -1240,6 +1270,13 @@ void WebServer::handleRequest(AsyncWebServerRequest *request) {
   }
 #endif
 
+#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
+  if (request->method() == HTTP_OPTIONS && request->hasHeader(HEADER_CORS_REQ_PNA)) {
+    this->handle_pna_cors_request(request);
+    return;
+  }
+#endif
+
   UrlMatch match = match_url(request->url().c_str());
 #ifdef USE_SENSOR
   if (match.domain == "sensor") {
diff --git a/esphome/components/web_server/web_server.h b/esphome/components/web_server/web_server.h
index 45b99d4eba..465e231984 100644
--- a/esphome/components/web_server/web_server.h
+++ b/esphome/components/web_server/web_server.h
@@ -130,6 +130,11 @@ class WebServer : public Controller, public Component, public AsyncWebHandler {
   void handle_js_request(AsyncWebServerRequest *request);
 #endif
 
+#ifdef USE_WEBSERVER_PRIVATE_NETWORK_ACCESS
+  // Handle Private Network Access CORS OPTIONS request
+  void handle_pna_cors_request(AsyncWebServerRequest *request);
+#endif
+
 #ifdef USE_SENSOR
   void on_sensor_update(sensor::Sensor *obj, float state) override;
   /// Handle a sensor request under '/sensor/<id>'.
diff --git a/esphome/components/web_server_idf/web_server_idf.cpp b/esphome/components/web_server_idf/web_server_idf.cpp
index 444e682460..8e67f3f169 100644
--- a/esphome/components/web_server_idf/web_server_idf.cpp
+++ b/esphome/components/web_server_idf/web_server_idf.cpp
@@ -51,6 +51,14 @@ void AsyncWebServer::begin() {
         .user_ctx = this,
     };
     httpd_register_uri_handler(this->server_, &handler_post);
+
+    const httpd_uri_t handler_options = {
+        .uri = "",
+        .method = HTTP_OPTIONS,
+        .handler = AsyncWebServer::request_handler,
+        .user_ctx = this,
+    };
+    httpd_register_uri_handler(this->server_, &handler_options);
   }
 }
 
@@ -80,6 +88,8 @@ AsyncWebServerRequest::~AsyncWebServerRequest() {
   }
 }
 
+bool AsyncWebServerRequest::hasHeader(const char *name) const { return httpd_req_get_hdr_value_len(*this, name); }
+
 optional<std::string> AsyncWebServerRequest::get_header(const char *name) const {
   size_t buf_len = httpd_req_get_hdr_value_len(*this, name);
   if (buf_len == 0) {
@@ -305,6 +315,10 @@ AsyncEventSourceResponse::AsyncEventSourceResponse(const AsyncWebServerRequest *
   httpd_resp_set_hdr(req, "Cache-Control", "no-cache");
   httpd_resp_set_hdr(req, "Connection", "keep-alive");
 
+  for (const auto &pair : DefaultHeaders::Instance().headers_) {
+    httpd_resp_set_hdr(req, pair.first.c_str(), pair.second.c_str());
+  }
+
   httpd_resp_send_chunk(req, CRLF_STR, CRLF_LEN);
 
   req->sess_ctx = this;
diff --git a/esphome/components/web_server_idf/web_server_idf.h b/esphome/components/web_server_idf/web_server_idf.h
index f3cecca16f..bc64e5231e 100644
--- a/esphome/components/web_server_idf/web_server_idf.h
+++ b/esphome/components/web_server_idf/web_server_idf.h
@@ -157,6 +157,8 @@ class AsyncWebServerRequest {
 
   operator httpd_req_t *() const { return this->req_; }
   optional<std::string> get_header(const char *name) const;
+  // NOLINTNEXTLINE(readability-identifier-naming)
+  bool hasHeader(const char *name) const;
 
  protected:
   httpd_req_t *req_;
@@ -254,6 +256,7 @@ class AsyncEventSource : public AsyncWebHandler {
 
 class DefaultHeaders {
   friend class AsyncWebServerRequest;
+  friend class AsyncEventSourceResponse;
 
  public:
   // NOLINTNEXTLINE(readability-identifier-naming)
diff --git a/esphome/const.py b/esphome/const.py
index 9457958863..c2fa9951ff 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -227,6 +227,7 @@ CONF_ELSE = "else"
 CONF_ENABLE_BTM = "enable_btm"
 CONF_ENABLE_IPV6 = "enable_ipv6"
 CONF_ENABLE_PIN = "enable_pin"
+CONF_ENABLE_PRIVATE_NETWORK_ACCESS = "enable_private_network_access"
 CONF_ENABLE_RRM = "enable_rrm"
 CONF_ENABLE_TIME = "enable_time"
 CONF_ENERGY = "energy"

From 888c298d7e73d5d3a670e640a0bcb0b0c40d9830 Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Tue, 7 Nov 2023 13:59:26 +1300
Subject: [PATCH 125/131] Update esphome-dashboard to version 20231107.0
 (#5686)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2747258883..4e9a1c3b0e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
-esphome-dashboard==20230904.0
+esphome-dashboard==20231107.0
 aioesphomeapi==18.2.1
 zeroconf==0.120.0
 

From 31fec2d6920f677f18b07b5280359850648891fc Mon Sep 17 00:00:00 2001
From: Charles Johnson <32775248+ChemicalXandco@users.noreply.github.com>
Date: Tue, 7 Nov 2023 05:17:13 +0000
Subject: [PATCH 126/131] add wifi.on_connect and wifi.on_disconnect triggers
 (#3639)

Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/wifi/__init__.py        | 20 +++++++++++++++++++-
 esphome/components/wifi/wifi_component.cpp | 10 ++++++++++
 esphome/components/wifi/wifi_component.h   | 15 +++++++++++----
 tests/test1.yaml                           |  4 ++++
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/esphome/components/wifi/__init__.py b/esphome/components/wifi/__init__.py
index 86ce53b804..c42835f169 100644
--- a/esphome/components/wifi/__init__.py
+++ b/esphome/components/wifi/__init__.py
@@ -32,6 +32,8 @@ from esphome.const import (
     CONF_KEY,
     CONF_USERNAME,
     CONF_EAP,
+    CONF_ON_CONNECT,
+    CONF_ON_DISCONNECT,
 )
 from esphome.core import CORE, HexInt, coroutine_with_priority
 from esphome.components.esp32 import add_idf_sdkconfig_option, get_esp32_variant, const
@@ -306,6 +308,10 @@ CONFIG_SCHEMA = cv.All(
                 "new mdns component instead."
             ),
             cv.Optional(CONF_ENABLE_ON_BOOT, default=True): cv.boolean,
+            cv.Optional(CONF_ON_CONNECT): automation.validate_automation(single=True),
+            cv.Optional(CONF_ON_DISCONNECT): automation.validate_automation(
+                single=True
+            ),
         }
     ),
     _validate,
@@ -425,9 +431,21 @@ async def to_code(config):
 
     cg.add_define("USE_WIFI")
 
-    # Register at end for OTA safe mode
+    # must register before OTA safe mode check
     await cg.register_component(var, config)
 
+    await cg.past_safe_mode()
+
+    if on_connect_config := config.get(CONF_ON_CONNECT):
+        await automation.build_automation(
+            var.get_connect_trigger(), [], on_connect_config
+        )
+
+    if on_disconnect_config := config.get(CONF_ON_DISCONNECT):
+        await automation.build_automation(
+            var.get_disconnect_trigger(), [], on_disconnect_config
+        )
+
 
 @automation.register_condition("wifi.connected", WiFiConnectedCondition, cv.Schema({}))
 async def wifi_connected_to_code(config, condition_id, template_arg, args):
diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index b08f20de21..95d430de4f 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -138,9 +138,19 @@ void WiFiComponent::loop() {
           ESP_LOGW(TAG, "WiFi Connection lost... Reconnecting...");
           this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
           this->retry_connect();
+
+          if (this->handled_connected_state_) {
+            this->disconnect_trigger_->trigger();
+            this->handled_connected_state_ = false;
+          }
         } else {
           this->status_clear_warning();
           this->last_connected_ = now;
+
+          if (!this->handled_connected_state_) {
+            this->connect_trigger_->trigger();
+            this->handled_connected_state_ = true;
+          }
         }
         break;
       }
diff --git a/esphome/components/wifi/wifi_component.h b/esphome/components/wifi/wifi_component.h
index b418a5b353..3ee69bb5de 100644
--- a/esphome/components/wifi/wifi_component.h
+++ b/esphome/components/wifi/wifi_component.h
@@ -1,18 +1,18 @@
 #pragma once
 
+#include "esphome/components/network/ip_address.h"
+#include "esphome/core/automation.h"
 #include "esphome/core/component.h"
 #include "esphome/core/defines.h"
-#include "esphome/core/automation.h"
 #include "esphome/core/helpers.h"
-#include "esphome/components/network/ip_address.h"
 
 #include <string>
 #include <vector>
 
 #ifdef USE_ESP32_FRAMEWORK_ARDUINO
-#include <esp_wifi.h>
-#include <WiFiType.h>
 #include <WiFi.h>
+#include <WiFiType.h>
+#include <esp_wifi.h>
 #endif
 
 #ifdef USE_LIBRETINY
@@ -294,6 +294,9 @@ class WiFiComponent : public Component {
 
   void set_enable_on_boot(bool enable_on_boot) { this->enable_on_boot_ = enable_on_boot; }
 
+  Trigger<> *get_connect_trigger() const { return this->connect_trigger_; };
+  Trigger<> *get_disconnect_trigger() const { return this->disconnect_trigger_; };
+
  protected:
   static std::string format_mac_addr(const uint8_t mac[6]);
   void setup_ap_config_();
@@ -354,6 +357,7 @@ class WiFiComponent : public Component {
   bool has_ap_{false};
   WiFiAP ap_;
   WiFiComponentState state_{WIFI_COMPONENT_STATE_OFF};
+  bool handled_connected_state_{false};
   uint32_t action_started_;
   uint8_t num_retried_{0};
   uint32_t last_connected_{0};
@@ -373,6 +377,9 @@ class WiFiComponent : public Component {
   bool rrm_{false};
 #endif
   bool enable_on_boot_;
+
+  Trigger<> *connect_trigger_{new Trigger<>()};
+  Trigger<> *disconnect_trigger_{new Trigger<>()};
 };
 
 extern WiFiComponent *global_wifi_component;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
diff --git a/tests/test1.yaml b/tests/test1.yaml
index f653960c40..6d1136eb1b 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -73,6 +73,10 @@ wifi:
   domain: .local
   reboot_timeout: 120s
   power_save_mode: light
+  on_connect:
+    - light.turn_on: ${roomname}_lights
+  on_disconnect:
+    - light.turn_off: ${roomname}_lights
 
 network:
   enable_ipv6: true

From 78e3ce7718677e56d04823684f7cf20a006d6817 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 7 Nov 2023 00:04:55 -0600
Subject: [PATCH 127/131] Implement a memory cache for dashboard entries to
 avoid frequent disk reads (#5687)

---
 esphome/dashboard/dashboard.py | 92 ++++++++++++++++++++++++++++++++--
 1 file changed, 87 insertions(+), 5 deletions(-)

diff --git a/esphome/dashboard/dashboard.py b/esphome/dashboard/dashboard.py
index b416b00e60..119094de28 100644
--- a/esphome/dashboard/dashboard.py
+++ b/esphome/dashboard/dashboard.py
@@ -67,6 +67,9 @@ class DashboardSettings:
         self.on_ha_addon = False
         self.cookie_secret = None
         self.absolute_config_dir = None
+        self._entry_cache: dict[
+            str, tuple[tuple[int, int, float, int], DashboardEntry]
+        ] = {}
 
     def parse_args(self, args):
         self.on_ha_addon = args.ha_addon
@@ -121,9 +124,70 @@ class DashboardSettings:
         Path(joined_path).resolve().relative_to(self.absolute_config_dir)
         return joined_path
 
-    def list_yaml_files(self):
+    def list_yaml_files(self) -> list[str]:
         return util.list_yaml_files([self.config_dir])
 
+    def entries(self) -> list[DashboardEntry]:
+        """Fetch all dashboard entries, thread-safe."""
+        path_to_cache_key: dict[str, tuple[int, int, float, int]] = {}
+        #
+        # The cache key is (inode, device, mtime, size)
+        # which allows us to avoid locking since it ensures
+        # every iteration of this call will always return the newest
+        # items from disk at the cost of a stat() call on each
+        # file which is much faster than reading the file
+        # for the cache hit case which is the common case.
+        #
+        # Because there is no lock the cache may
+        # get built more than once but that's fine as its still
+        # thread-safe and results in orders of magnitude less
+        # reads from disk than if we did not cache at all and
+        # does not have a lock contention issue.
+        #
+        for file in self.list_yaml_files():
+            try:
+                # Prefer the json storage path if it exists
+                stat = os.stat(ext_storage_path(os.path.basename(file)))
+            except OSError:
+                try:
+                    # Fallback to the yaml file if the storage
+                    # file does not exist or could not be generated
+                    stat = os.stat(file)
+                except OSError:
+                    # File was deleted, ignore
+                    continue
+            path_to_cache_key[file] = (
+                stat.st_ino,
+                stat.st_dev,
+                stat.st_mtime,
+                stat.st_size,
+            )
+
+        entry_cache = self._entry_cache
+
+        # Remove entries that no longer exist
+        removed: list[str] = []
+        for file in entry_cache:
+            if file not in path_to_cache_key:
+                removed.append(file)
+
+        for file in removed:
+            entry_cache.pop(file)
+
+        dashboard_entries: list[DashboardEntry] = []
+        for file, cache_key in path_to_cache_key.items():
+            if cached_entry := entry_cache.get(file):
+                entry_key, dashboard_entry = cached_entry
+                if entry_key == cache_key:
+                    dashboard_entries.append(dashboard_entry)
+                    continue
+
+            dashboard_entry = DashboardEntry(file)
+            dashboard_entries.append(dashboard_entry)
+            entry_cache[file] = (cache_key, dashboard_entry)
+
+        return dashboard_entries
+
 
 settings = DashboardSettings()
 
@@ -657,18 +721,26 @@ class EsphomeVersionHandler(BaseHandler):
         self.finish()
 
 
-def _list_dashboard_entries():
-    files = settings.list_yaml_files()
-    return [DashboardEntry(file) for file in files]
+def _list_dashboard_entries() -> list[DashboardEntry]:
+    return settings.entries()
 
 
 class DashboardEntry:
-    def __init__(self, path):
+    """Represents a single dashboard entry.
+
+    This class is thread-safe and read-only.
+    """
+
+    __slots__ = ("path", "_storage", "_loaded_storage")
+
+    def __init__(self, path: str) -> None:
+        """Initialize the DashboardEntry."""
         self.path = path
         self._storage = None
         self._loaded_storage = False
 
     def __repr__(self):
+        """Return the representation of this entry."""
         return (
             f"DashboardEntry({self.path} "
             f"address={self.address} "
@@ -679,10 +751,12 @@ class DashboardEntry:
 
     @property
     def filename(self):
+        """Return the filename of this entry."""
         return os.path.basename(self.path)
 
     @property
     def storage(self) -> StorageJSON | None:
+        """Return the StorageJSON object for this entry."""
         if not self._loaded_storage:
             self._storage = StorageJSON.load(ext_storage_path(self.filename))
             self._loaded_storage = True
@@ -690,48 +764,56 @@ class DashboardEntry:
 
     @property
     def address(self):
+        """Return the address of this entry."""
         if self.storage is None:
             return None
         return self.storage.address
 
     @property
     def no_mdns(self):
+        """Return the no_mdns of this entry."""
         if self.storage is None:
             return None
         return self.storage.no_mdns
 
     @property
     def web_port(self):
+        """Return the web port of this entry."""
         if self.storage is None:
             return None
         return self.storage.web_port
 
     @property
     def name(self):
+        """Return the name of this entry."""
         if self.storage is None:
             return self.filename.replace(".yml", "").replace(".yaml", "")
         return self.storage.name
 
     @property
     def friendly_name(self):
+        """Return the friendly name of this entry."""
         if self.storage is None:
             return self.name
         return self.storage.friendly_name
 
     @property
     def comment(self):
+        """Return the comment of this entry."""
         if self.storage is None:
             return None
         return self.storage.comment
 
     @property
     def target_platform(self):
+        """Return the target platform of this entry."""
         if self.storage is None:
             return None
         return self.storage.target_platform
 
     @property
     def update_available(self):
+        """Return if an update is available for this entry."""
         if self.storage is None:
             return True
         return self.update_old != self.update_new

From ccffbfd3ae8be5f535701e427de58a935af58f1d Mon Sep 17 00:00:00 2001
From: Angel Nunez Mencias <git@angelnu.com>
Date: Tue, 7 Nov 2023 10:15:13 +0100
Subject: [PATCH 128/131] support spi for sn74hc595 (#5491)

Co-authored-by: Jimmy Hedman <jimmy.hedman@gmail.com>
Co-authored-by: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
---
 esphome/components/sn74hc595/__init__.py   | 65 +++++++++++++++-----
 esphome/components/sn74hc595/sn74hc595.cpp | 70 +++++++++++++++-------
 esphome/components/sn74hc595/sn74hc595.h   | 54 +++++++++++++----
 tests/test1.yaml                           |  8 ++-
 4 files changed, 149 insertions(+), 48 deletions(-)

diff --git a/esphome/components/sn74hc595/__init__.py b/esphome/components/sn74hc595/__init__.py
index e98da72304..e7ba45175c 100644
--- a/esphome/components/sn74hc595/__init__.py
+++ b/esphome/components/sn74hc595/__init__.py
@@ -1,8 +1,10 @@
 import esphome.codegen as cg
 import esphome.config_validation as cv
 from esphome import pins
+from esphome.components import spi
 from esphome.const import (
     CONF_ID,
+    CONF_SPI_ID,
     CONF_MODE,
     CONF_NUMBER,
     CONF_INVERTED,
@@ -10,13 +12,20 @@ from esphome.const import (
     CONF_CLOCK_PIN,
     CONF_OUTPUT,
 )
+from esphome.core import EsphomeError
 
-DEPENDENCIES = []
 MULTI_CONF = True
 
 sn74hc595_ns = cg.esphome_ns.namespace("sn74hc595")
 
 SN74HC595Component = sn74hc595_ns.class_("SN74HC595Component", cg.Component)
+SN74HC595GPIOComponent = sn74hc595_ns.class_(
+    "SN74HC595GPIOComponent", SN74HC595Component
+)
+SN74HC595SPIComponent = sn74hc595_ns.class_(
+    "SN74HC595SPIComponent", SN74HC595Component, spi.SPIDevice
+)
+
 SN74HC595GPIOPin = sn74hc595_ns.class_(
     "SN74HC595GPIOPin", cg.GPIOPin, cg.Parented.template(SN74HC595Component)
 )
@@ -25,25 +34,51 @@ CONF_SN74HC595 = "sn74hc595"
 CONF_LATCH_PIN = "latch_pin"
 CONF_OE_PIN = "oe_pin"
 CONF_SR_COUNT = "sr_count"
-CONFIG_SCHEMA = cv.Schema(
-    {
-        cv.Required(CONF_ID): cv.declare_id(SN74HC595Component),
-        cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
-        cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
-        cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
-        cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
-        cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
-    }
-).extend(cv.COMPONENT_SCHEMA)
+
+
+CONFIG_SCHEMA = cv.Any(
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(SN74HC595GPIOComponent),
+            cv.Required(CONF_DATA_PIN): pins.gpio_output_pin_schema,
+            cv.Required(CONF_CLOCK_PIN): pins.gpio_output_pin_schema,
+            cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
+        }
+    ).extend(cv.COMPONENT_SCHEMA),
+    cv.Schema(
+        {
+            cv.Required(CONF_ID): cv.declare_id(SN74HC595SPIComponent),
+            cv.Required(CONF_LATCH_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_OE_PIN): pins.gpio_output_pin_schema,
+            cv.Optional(CONF_SR_COUNT, default=1): cv.int_range(min=1, max=256),
+        }
+    )
+    .extend(cv.COMPONENT_SCHEMA)
+    .extend(spi.spi_device_schema(cs_pin_required=False))
+    .extend(
+        {
+            cv.Required(CONF_SPI_ID): cv.use_id(spi.SPIComponent),
+        }
+    ),
+    msg='Either "data_pin" and "clock_pin" must be set or "spi_id" must be set.',
+)
 
 
 async def to_code(config):
     var = cg.new_Pvariable(config[CONF_ID])
     await cg.register_component(var, config)
-    data_pin = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
-    cg.add(var.set_data_pin(data_pin))
-    clock_pin = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
-    cg.add(var.set_clock_pin(clock_pin))
+    if CONF_DATA_PIN in config:
+        data_pin = await cg.gpio_pin_expression(config[CONF_DATA_PIN])
+        cg.add(var.set_data_pin(data_pin))
+        clock_pin = await cg.gpio_pin_expression(config[CONF_CLOCK_PIN])
+        cg.add(var.set_clock_pin(clock_pin))
+    elif CONF_SPI_ID in config:
+        await spi.register_spi_device(var, config)
+    else:
+        raise EsphomeError("Not supported")
+
     latch_pin = await cg.gpio_pin_expression(config[CONF_LATCH_PIN])
     cg.add(var.set_latch_pin(latch_pin))
     if CONF_OE_PIN in config:
diff --git a/esphome/components/sn74hc595/sn74hc595.cpp b/esphome/components/sn74hc595/sn74hc595.cpp
index 1895b1d5a6..8a37c3bece 100644
--- a/esphome/components/sn74hc595/sn74hc595.cpp
+++ b/esphome/components/sn74hc595/sn74hc595.cpp
@@ -6,26 +6,39 @@ namespace sn74hc595 {
 
 static const char *const TAG = "sn74hc595";
 
-void SN74HC595Component::setup() {
+void SN74HC595Component::pre_setup_() {
   ESP_LOGCONFIG(TAG, "Setting up SN74HC595...");
 
   if (this->have_oe_pin_) {  // disable output
     this->oe_pin_->setup();
     this->oe_pin_->digital_write(true);
   }
-
-  // initialize output pins
-  this->clock_pin_->setup();
-  this->data_pin_->setup();
+}
+void SN74HC595Component::post_setup_() {
   this->latch_pin_->setup();
-  this->clock_pin_->digital_write(false);
-  this->data_pin_->digital_write(false);
   this->latch_pin_->digital_write(false);
 
   // send state to shift register
-  this->write_gpio_();
+  this->write_gpio();
 }
 
+void SN74HC595GPIOComponent::setup() {
+  this->pre_setup_();
+  this->clock_pin_->setup();
+  this->data_pin_->setup();
+  this->clock_pin_->digital_write(false);
+  this->data_pin_->digital_write(false);
+  this->post_setup_();
+}
+
+#ifdef USE_SPI
+void SN74HC595SPIComponent::setup() {
+  this->pre_setup_();
+  this->spi_setup();
+  this->post_setup_();
+}
+#endif
+
 void SN74HC595Component::dump_config() { ESP_LOGCONFIG(TAG, "SN74HC595:"); }
 
 void SN74HC595Component::digital_write_(uint16_t pin, bool value) {
@@ -34,17 +47,38 @@ void SN74HC595Component::digital_write_(uint16_t pin, bool value) {
              (this->sr_count_ * 8) - 1);
     return;
   }
-  this->output_bits_[pin] = value;
-  this->write_gpio_();
+  if (value) {
+    this->output_bytes_[pin / 8] |= (1 << (pin % 8));
+  } else {
+    this->output_bytes_[pin / 8] &= ~(1 << (pin % 8));
+  }
+  this->write_gpio();
 }
 
-void SN74HC595Component::write_gpio_() {
-  for (auto bit = this->output_bits_.rbegin(); bit != this->output_bits_.rend(); bit++) {
-    this->data_pin_->digital_write(*bit);
-    this->clock_pin_->digital_write(true);
-    this->clock_pin_->digital_write(false);
+void SN74HC595GPIOComponent::write_gpio() {
+  for (auto byte = this->output_bytes_.rbegin(); byte != this->output_bytes_.rend(); byte++) {
+    for (int8_t i = 7; i >= 0; i--) {
+      bool bit = (*byte >> i) & 1;
+      this->data_pin_->digital_write(bit);
+      this->clock_pin_->digital_write(true);
+      this->clock_pin_->digital_write(false);
+    }
   }
+  SN74HC595Component::write_gpio();
+}
 
+#ifdef USE_SPI
+void SN74HC595SPIComponent::write_gpio() {
+  for (auto byte = this->output_bytes_.rbegin(); byte != this->output_bytes_.rend(); byte++) {
+    this->enable();
+    this->transfer_byte(*byte);
+    this->disable();
+  }
+  SN74HC595Component::write_gpio();
+}
+#endif
+
+void SN74HC595Component::write_gpio() {
   // pulse latch to activate new values
   this->latch_pin_->digital_write(true);
   this->latch_pin_->digital_write(false);
@@ -60,11 +94,7 @@ float SN74HC595Component::get_setup_priority() const { return setup_priority::IO
 void SN74HC595GPIOPin::digital_write(bool value) {
   this->parent_->digital_write_(this->pin_, value != this->inverted_);
 }
-std::string SN74HC595GPIOPin::dump_summary() const {
-  char buffer[32];
-  snprintf(buffer, sizeof(buffer), "%u via SN74HC595", pin_);
-  return buffer;
-}
+std::string SN74HC595GPIOPin::dump_summary() const { return str_snprintf("%u via SN74HC595", 18, pin_); }
 
 }  // namespace sn74hc595
 }  // namespace esphome
diff --git a/esphome/components/sn74hc595/sn74hc595.h b/esphome/components/sn74hc595/sn74hc595.h
index 64bf06d881..cb9d7bf140 100644
--- a/esphome/components/sn74hc595/sn74hc595.h
+++ b/esphome/components/sn74hc595/sn74hc595.h
@@ -1,9 +1,14 @@
 #pragma once
 
 #include "esphome/core/component.h"
+#include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/helpers.h"
 
+#ifdef USE_SPI
+#include "esphome/components/spi/spi.h"
+#endif
+
 #include <vector>
 
 namespace esphome {
@@ -13,34 +18,33 @@ class SN74HC595Component : public Component {
  public:
   SN74HC595Component() = default;
 
-  void setup() override;
+  void setup() override = 0;
   float get_setup_priority() const override;
   void dump_config() override;
 
-  void set_data_pin(GPIOPin *pin) { data_pin_ = pin; }
-  void set_clock_pin(GPIOPin *pin) { clock_pin_ = pin; }
-  void set_latch_pin(GPIOPin *pin) { latch_pin_ = pin; }
+  void set_latch_pin(GPIOPin *pin) { this->latch_pin_ = pin; }
   void set_oe_pin(GPIOPin *pin) {
-    oe_pin_ = pin;
-    have_oe_pin_ = true;
+    this->oe_pin_ = pin;
+    this->have_oe_pin_ = true;
   }
   void set_sr_count(uint8_t count) {
-    sr_count_ = count;
-    this->output_bits_.resize(count * 8);
+    this->sr_count_ = count;
+    this->output_bytes_.resize(count);
   }
 
  protected:
   friend class SN74HC595GPIOPin;
   void digital_write_(uint16_t pin, bool value);
-  void write_gpio_();
+  virtual void write_gpio();
+
+  void pre_setup_();
+  void post_setup_();
 
-  GPIOPin *data_pin_;
-  GPIOPin *clock_pin_;
   GPIOPin *latch_pin_;
   GPIOPin *oe_pin_;
   uint8_t sr_count_;
   bool have_oe_pin_{false};
-  std::vector<bool> output_bits_;
+  std::vector<uint8_t> output_bytes_;
 };
 
 /// Helper class to expose a SC74HC595 pin as an internal output GPIO pin.
@@ -60,5 +64,31 @@ class SN74HC595GPIOPin : public GPIOPin, public Parented<SN74HC595Component> {
   bool inverted_;
 };
 
+class SN74HC595GPIOComponent : public SN74HC595Component {
+ public:
+  void setup() override;
+  void set_data_pin(GPIOPin *pin) { data_pin_ = pin; }
+  void set_clock_pin(GPIOPin *pin) { clock_pin_ = pin; }
+
+ protected:
+  void write_gpio() override;
+
+  GPIOPin *data_pin_;
+  GPIOPin *clock_pin_;
+};
+
+#ifdef USE_SPI
+class SN74HC595SPIComponent : public SN74HC595Component,
+                              public spi::SPIDevice<spi::BIT_ORDER_MSB_FIRST, spi::CLOCK_POLARITY_LOW,
+                                                    spi::CLOCK_PHASE_LEADING, spi::DATA_RATE_4MHZ> {
+ public:
+  void setup() override;
+
+ protected:
+  void write_gpio() override;
+};
+
+#endif
+
 }  // namespace sn74hc595
 }  // namespace esphome
diff --git a/tests/test1.yaml b/tests/test1.yaml
index 6d1136eb1b..32e92440c1 100644
--- a/tests/test1.yaml
+++ b/tests/test1.yaml
@@ -189,6 +189,7 @@ i2c:
   id: i2c_bus
 
 spi:
+  id: spi_bus
   clk_pin: GPIO21
   mosi_pin: GPIO22
   miso_pin: GPIO23
@@ -2737,7 +2738,7 @@ switch:
   - platform: gpio
     name: "SN74HC595 Pin #0"
     pin:
-      sn74hc595: sn74hc595_hub
+      sn74hc595: sn74hc595_hub_2
       # Use pin number 0
       number: 0
       inverted: false
@@ -3385,6 +3386,11 @@ sn74hc595:
     latch_pin: GPIO22
     oe_pin: GPIO32
     sr_count: 2
+  - id: sn74hc595_hub_2
+    latch_pin: GPIO22
+    oe_pin: GPIO32
+    sr_count: 2
+    spi_id: spi_bus
 
 rtttl:
   output: gpio_19

From 9bd4b229e3cdc5d599c4b2612b744c85494fcfad Mon Sep 17 00:00:00 2001
From: Keith Burzinski <kbx81x@gmail.com>
Date: Tue, 7 Nov 2023 12:00:36 -0600
Subject: [PATCH 129/131] Handle on_disconnect when Wi-Fi is disabled (#5691)

---
 esphome/components/wifi/wifi_component.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/esphome/components/wifi/wifi_component.cpp b/esphome/components/wifi/wifi_component.cpp
index 95d430de4f..cd87bb48a7 100644
--- a/esphome/components/wifi/wifi_component.cpp
+++ b/esphome/components/wifi/wifi_component.cpp
@@ -109,6 +109,15 @@ void WiFiComponent::loop() {
   const uint32_t now = millis();
 
   if (this->has_sta()) {
+    if (this->is_connected() != this->handled_connected_state_) {
+      if (this->handled_connected_state_) {
+        this->disconnect_trigger_->trigger();
+      } else {
+        this->connect_trigger_->trigger();
+      }
+      this->handled_connected_state_ = this->is_connected();
+    }
+
     switch (this->state_) {
       case WIFI_COMPONENT_STATE_COOLDOWN: {
         this->status_set_warning();
@@ -138,19 +147,9 @@ void WiFiComponent::loop() {
           ESP_LOGW(TAG, "WiFi Connection lost... Reconnecting...");
           this->state_ = WIFI_COMPONENT_STATE_STA_CONNECTING;
           this->retry_connect();
-
-          if (this->handled_connected_state_) {
-            this->disconnect_trigger_->trigger();
-            this->handled_connected_state_ = false;
-          }
         } else {
           this->status_clear_warning();
           this->last_connected_ = now;
-
-          if (!this->handled_connected_state_) {
-            this->connect_trigger_->trigger();
-            this->handled_connected_state_ = true;
-          }
         }
         break;
       }

From 0101ae768ca187dac788f230218fd95737dd7d3d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:44:33 -0600
Subject: [PATCH 130/131] Bump aioesphomeapi from 18.2.1 to 18.2.4 (#5692)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4e9a1c3b0e..69c73fa952 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ platformio==6.1.11  # When updating platformio, also update Dockerfile
 esptool==4.6.2
 click==8.1.7
 esphome-dashboard==20231107.0
-aioesphomeapi==18.2.1
+aioesphomeapi==18.2.4
 zeroconf==0.120.0
 
 # esp-idf requires this, but doesn't bundle it by default

From fff2d01420a8b76cdfaeb79aa7d9098440e6bdca Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Wed, 8 Nov 2023 13:13:56 +1300
Subject: [PATCH 131/131] Bump version to 2023.11.0b1

---
 esphome/const.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esphome/const.py b/esphome/const.py
index 11197ef6c8..83c596a071 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2023.10.6"
+__version__ = "2023.11.0b1"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 VALID_SUBSTITUTIONS_CHARACTERS = (